New Layout: Wrong fields order on preview before submit page