clean-up css
Merge commit 'github/testing' into beta