Changed rest of the forms to use partials