updates to templates and views as we enter the home stretch