Commits for both #642 and #644.

Megamenu content updates + megamenu highlighting.