Improved navigation tags