Fixed navigation hiccups

Regressions:
-references problems due to renaming