Refactor nav for smaller VWs