Update sass and make minor optimizations