Cleaning up admin controllers
Merge branch 'refactoring'