UX cleanup: reorder options in the main settings screen.