Changed settings page UI
Merge branch 'develop' of https://github.com/ssourabh/Mosaic into develop