Overlay changes

Lots of overlay changes.