Combine link and change description name

Plus other small updates