Improve navigation experience in popup and remove user countdown