SASS/CSS imporovements