lots of navigation aliases added