Remove unnecessary overlays
Tweak overlays a bit