Many global nav changes, and other misc. changes