Add tags and appropriate classing