fix some ui flow issues