Refactor nav w nesting