Use config.view.container
Merge branch 'master' into snapshot-navigation