Fixed formatting and links