Merge pull request #115 from yogeshchaugule/develop

Develop - Changes by Yogesh
Merge pull request #116 from yogeshchaugule/develop

Develop - Changes by Yogesh
Merge pull request #117 from yogeshchaugule/develop

Develop - Changes by Priyanka and Yogesh
Styling fixes by Emanuel and Sonia
Merge pull request #118 from yogeshchaugule/design

Design - changes by Sonia and Emanuel