Bug fixes to settings page ordering