forms and map now also in partials