Menu system redesign