Small update to templating and form changes