Added menu headings. Some minor fixes.