Merge pull request #88 from yogeshchaugule/develop

Develop - Changes in CMS by Priyanka and Yogesh
more fixes and tools page
Merge pull request #89 from yogeshchaugule/design

Design - changes by Emanuel