Updates to templates to support new layout