Fixing some CSS bugs.
Update screenshots for release.
Merge branch 'release/2.1' into develop