Moving spans out of anchors.  Styling needs fixing, unless we like it this way.