Use menu captions instead of CSS hacks.

Thanks to josegonzalez who found this technique for adding menus. It
makes the menus easier to maintain as the titles are with the menus.

I've also removed the 20px left margin on the TOC as it gives us some
more space.