#2 Improvements on main page disign
Merge branch 'feature/main_screen' into develop