Update to newer css and some different behavior