Made the settings button stand out so we'll deal with it.
Merge branch 'master' into permissions