Fixed UI related bugs

Fixed UI related bugs
There is already a navigating event handler. Do you know in what order the two get called and whether this matters (especially when navigation is canceled in the handler)?