Added page headings and improved layout