more work on MainScreen