Fixed navigation issues