Fix bugs and add page headings