structural changes to support Iframes