Improved navigation on reconnect.