Changed a lot of links, rmeoved some, move other icons to a more correct place