Refactor forms with partials