Fix color
Layout fixes, scss cleanup