Changed some navigation stuff