Added data-* attributes for UI testing