Merge pull request #132 from yogeshchaugule/design

Design - Changes by Alex and Yogesh
Merge pull request #133 from yogeshchaugule/design

Design - Changes by Alex and Yogesh
Fixes for iPhone issue
Merge pull request #134 from yogeshchaugule/develop

Design - Changes by Yogesh