wip: fix nav