refactored form for gold app
wrong branch