refactored form for gold app