CSS + other cleanup