Updated templates, models and views