proper pages and linking added