Changed tags and adjusted author list view
Fixed Merge Conflict