Added new classes for css
Merge origin/master