CHORE: Change the menu order