Integrated Matt's CSS changes into SASS