Cleaned up main menu