Tweaked session and navigation workflow.