Work on fixing up the links