Got links properly working, or so I think