Added and fixed links to make page navigation more consistent