Added CSS classes matching original ones
Merge branch 'feature_001' into 'master'