[CSS] More fixes