clean up window_overlay and refactor