Changed a bunch of link locations, comumns and formats