Update to templates to match HTML dev