UI fields order change