Additional fixes in the SCSS