More WP1.8.5 Overlay stuff

More WP1.8.5 Overlay stuff