Fix number and add link