Improve formatting and add links