Update template rendering to be true to form