fixed up uri-based navigation a bit