Refactoring of the navigation to make a nicer Tools menu