Refactored custom form page