Updates done at work

- finish up template
- clean up models and controllers