fixing navs wip