Design Updates

Solving the issues that @iambibhas recently emailed me about.
 - [ ] #96 
 - [ ] #97