fixed all zorder ordering bugs