Improved OverlayContainer
Merge branch 'master' into gallery