Clean up menu logic