Revert "Hardcoded navigation"

This reverts commit e639c1b6a0e693d21b010361af1b94ca149a2b3f.