More main screen changes