Fixed settings UI
More things because Git is stupid.
Merge branch 'master' of https://github.com/CodePilotCo/CMS