Bug fixes
Changing the order of the form fields