Updated to use SASS