Updated order fields and played with the form a little