Add navigation_extra_tools

Code cleanup

# Conflicts:
#	composer.json

Remove Linkit as it's now part of core