Fixes to subpage navigation.