Partially fixed navigation isuue