Complete re-work of the Overlay