Remove font size classes before adding
Fixed the change of class for font size
Merge branch 'development'