css fix
Merge branch '1.x'