Design Updates

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