Add toggle to admin
pep8
Merge pull request #897 from gannetson/crazy-branch

Some fixes after merging