Fixed the settings order