Fix bug 1010659 - Add tools to main nav
Fix bug 1010660 - Simplify tool links