Formatting changes

Rearrange the links so that they render correctly and are generally more readable