Add better navigation tool