Updated SCSS + Class names