Link pages

merging changes from the final meeting