further resolve transition issues from menu