Merge pull request #123 from yogeshchaugule/develop

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

Develop - Changes in CMS by Priyanka and Yogesh
Style changes by Emanuel
Merge pull request #125 from yogeshchaugule/design

Design - changes by Emanuel