Fix bug 1010659 - Add tools to main nav