CSS updates, class names updates