[misc] Reordered form elements