Fixed nav positions, repaired update navigation step there