Overlay as service
big clean up and improved overlay