Fixed issues with global nav and async fetching of markers.  Fixes #109