Link and format fix