some small css improvements
Merge branch 'master' into release-2.0