Updated models, views and templates