Add links and update formatting