redesigning the form (ref: #600)