smaller font-size in nav to handle longer strings.
Merge remote-tracking branch 'upstream/FORE!' into 4.0