#4 Fixed linking to other pages