Merge "(bug 457) use semantic headings for the navigation menu"