overhaul of main menu