Re-organize menu items