Restructuring form layout