Add tags, update templates with grid html structure