Improve Overlay interface