Reworked _form partial for area