change position of fields and modify some texts