Layout fixes, scss cleanup