Added basic tag management
Temporarily restored the old collab matrix tool in case the new system doesn't work