Spring cleaning.

Tidied up the models. Changed some views slightly. Fixed redirects. Attempted to indent correctly where possible.