fix edit misplacement on firefox
build merge