Corrected links and markup