Re-order settings form and add small UX improvements