Feature/new navigation

Henrik S. Zimmermannrequested to merge
feature/new-navigation into dev

Added two commits that were not pushed to the remote branch.

Merge request reports