Merge branch 'Add-a-controller'
A bunch of form changes

- Added Error states
- 2 views
Merge branch 'master' into gh-pages