More css simplification