refactoring, added some menu items to MainScreen2