Re-organized some menu options