Partial form templates refactored