Refactored form partial helpers