Preliminary CSS fixes + cleanup