Wrapping elements using JS. Entity data attributes for html elements. Cleaned up JS source.