Simplify down to right view
Merge branch 'master' into gh-pages