Updated the design as per suggestions. More info in comments!