Adding tags and refactoring article template