Recent updates to the templates to match our web 7 releasey