Fixed NavigationBug
Merge remote-tracking branch 'origin/Eric' into Remi
Rectangle Fertiggestellt - Bug fixes