Swapped view mode.
Merge branch 'feature/197'
Merge branch 'master' into test