Make description shorter and tweak some links