Updated Views and Templates