Improved formatting and links