changed sass files to better syntax
done refactoring scss