Fixed CSS and Sass issues