improve dom/classes and attributes