Ugly versions of basic views in place.
Merge branch 'master' into develop
Fix path.