refactored form view