Changed the form layout