Merge CSS modification from evenwu