Text edits + icons for different views.
Merge branch 'master' into gh-pages