Clean up menu and startup code a bit