rc: merged pretty all navigation stuff