Navigation improvements, consistency changes