More css style restructuring