Updated sass, mixins