Commit before Menu Rework