Session routing rework

Slight re-work to tidy up the Navigation View and login/logout.