Added more links and modified headings