Refactored form into partial