Fix links
Improved formatting