Cleaned up MainScreenActivity