Style fixes for issues
Merge pull request #119 from yogeshchaugule/design

Design - changes by Sonia