Redesign Main screen
Merge branch 'develop_IOS' into develop_android
Merge branch 'develop_android' into develop
Merge branch 'develop_IOS' into develop
Issue #354