Refactor form partials

@kitanata