Refactor edit/new with form partial for Boats