Change fields order