Consolidate remaining navigation.