Move ordering dropdown back into advanced form

This needs to be inside the advanced form so that when the form is
submitted the new ordering is picked up.
Fix bug with missing section title