Fix order of form elements