Fixing some navigation stuff