back port some CSS fixes