Change form input output order (#43)