main screen cosmetic refactoring