#2 Fix broken navigation, at least in part.