Adding pages
fix broken links
fix some merge conflicts