fixed nav, still need refactor