Merge pull request #85 from yogeshchaugule/develop

Develop - Changes in CMS by Priyanka and Yogesh
more fixes
Merge pull request #86 from yogeshchaugule/develop

Develop - Changes by Priyanka
Merge pull request #87 from yogeshchaugule/design

Design - changes by Emanuel