Enhanced linking of pages

Re-arranged linking between the pages.