fixed forms and used partials