Finished cleaning up controllers
Merge branch 'FixControllers'