10617 add form

As per the story this fixes the order of the fields and adds in missing scheduling options.