factored out form fields

Change-Id: I6c4980901db9027977e4797f46cc48a52846a182