tag refactoring, auto tags added, styles improved