Added some robustness to navigation linking