Improve overlays