Minor fixes for the main navigation bar

Merged Sandro Lutz requested to merge navbar into master

Merge request reports