Refactor nav
Refactor nav for smaller VWs