First commit
Fixing settings order