Fix links to work as a block, and remove unnecessary html tags