Redesign

A new design so that there's no confusion between my design and yours.
Also, a few improvements.

Test this design and then merge. Let me know if you want any changes.