Change order of fields according to feedback of support