Improve controllers across app
Implement basic structure of views