Nav bar refactor