Bug/3 css nomenclature

Improved CSS class names.