Fix nav labels
Merge branch 'fix_nav_label'