Updates to views and templates