Some .scss fixes and general code cleaning