Changed to using SCSS