#2197: Rearrange form elements further.