Correction to the nav on overly linked pages

There also seems to be some repeated commits that were not pulled in.  I believe they will die quietly, but it'll be double checked first.