Now use classes for better identification and css continuity