Fixes, & reorder menu options.