Moving the navigation plugin to the core