Added overlays and changed overlay display logic