Update the layout of the proposal form.

Put the proposal fields first and adjust the row structure.