Fixed #36 by rearranging form fields