catch up the CSS modifications from 5d3b327a0ea9dfa71c64f1f5d2ff3e2fff9c28b1 and 2c3297dd31c02e210529da50f5a8805f26d84ca8