Merge branch 'master' into local
Modified to use main layout.
Modified layouts; minor changes.  Added sidebar to multiple views.
Merge branch 'local'