CSS fix for chrome
Merge branch 'production' into test