Tagging add/remove working, but some formatting errors still
Fixed Merge errors