Add Tags, add changes from fontawesome