Cleaning up markup slightly, adding links