moderately working tags
merged some stuff into tags
resolved tag styling from master