Improved linking between pages