#2197: Move form elements around.