Small refactor in nav_view