make 4.0 useable

The transition to 4.0 made some elements of the navigation unusable.  These changes fix those problems.

#25