Menu overhaul