Refactor controllers

https://www.pivotaltracker.com/story/show/75988670