Changes by Alex for style fixes
Merge pull request #133 from yogeshchaugule/design

Design - Changes by Alex and Yogesh