Fix text and Add link