Adjust style of remove_tag in an attempt to better match existing designs

* move the "tag_remove" class to the <a> and remove the <span>
* move the remove link after the count