Shorten text and add links
Merge conflict