Merge CSS from wip for the new look