Merge branch 'polish_nav' into 'master' Polish nav See merge request xanderjakeq/startref!2