fix labels and fields order