fixed navigation stuff