Add better navigation detection and detection of successful log in