fix settings and make settings cog consistent everwhere
Merge pull request #190 from reviewninja/feature/fix-settings

fix settings and make settings cog consistent everwhere