Make the HTML easier to visually parse and more semantic
- Move disconnect links out of the headings