change fields order; fix bug popup