Added links, changed structure a bit, changed language a bit too