Reworking the description and links