more ui flow handling