Changes to the model and template and view