Revert "Remove navigation functionality"

This reverts commit 602d3bbd5493a45282ad68c9e797a581722f6662.
Revive navigation logic