More scss conversion
Fixes