Adding a wrapper for the iframes and cleaning up along the way.

This needs an extra (fresh) look before merging, pretty invasive.