Navigator bugfixes
Merge branch 'Niels' into develop