A bunch of form changes

- Added Error states
- 2 views