Added tagging to contents
added like feature, consistent UI for follow and refactored
Merged conficts