Build content navigation menu

Remove need for our variant code \o/ for a big red diff!

Change-Id: I1b72dfdfa0fccd360b41e4bba713f93f9db1b2eb
Merge "Build content navigation menu"