Changed the way navigation links work