Updated css classes
Fixed the data filter