Fixing a few navigation issues