Merge changes to css from master branch