Class selection menu and minor fixes