redesigning the form structure