diff --git a/pandora/text/templates/pdf/viewer.html b/pandora/text/templates/pdf/viewer.html
index 19031d09f..2bd84e563 100644
--- a/pandora/text/templates/pdf/viewer.html
+++ b/pandora/text/templates/pdf/viewer.html
@@ -23,6 +23,7 @@ limitations under the License.
     <link rel="stylesheet" href="/static/pdf.js/viewer.css"/>
 
     <script type="text/javascript" src="/static/oxjs/build/Ox.js"></script>
+    <script type="text/javascript" src="/static/oxjs/source/Ox.UI/js/Core/Message.js"></script>
     <script type="text/javascript" src="/static/pdf.js/compatibility.js"></script>
 
     <!-- This snippet is used in production, see Makefile -->
diff --git a/static/js/pandora.js b/static/js/pandora.js
index 690d21d07..1ba0e061b 100644
--- a/static/js/pandora.js
+++ b/static/js/pandora.js
@@ -314,15 +314,16 @@ appPanel
             Ox.Theme(pandora.user.ui.theme);
             if (isEmbed) {
                 pandora.$ui.embedPanel = pandora.ui.embedPanel().display();
-                window.addEventListener('message', function(e) {
-                    var data = {};
-                    try {
-                        data = JSON.parse(e.data);
-                    } catch(e) {}
-                    if (Ox.contains(pandora.site.themes, data.theme)) {
-                        Ox.Theme(data.theme);
-                    } else if (pandora.isEmbedURL(data.url)) {
-                        pandora.URL.push(data.url);
+                Ox.$parent.onMessage({
+                    settheme: function(data) {
+                        if (Ox.contains(pandora.site.themes, data.theme)) {
+                            Ox.Theme(data.theme);
+                        }
+                    },
+                    seturl: function(data) {
+                        if (pandora.isEmbedURL(data.url)) {
+                            pandora.URL.push(data.url);
+                        }
                     }
                 });
             } else {
diff --git a/static/js/pandora/embedPanel.js b/static/js/pandora/embedPanel.js
index 0fbebb658..13d8d4a06 100644
--- a/static/js/pandora/embedPanel.js
+++ b/static/js/pandora/embedPanel.js
@@ -126,6 +126,9 @@ pandora.ui.embedPanel = function() {
                             type: data.timeline
                         });
                     }
+                })
+                .bindEvent(function(data, event) {
+                    Ox.$parent.postMessage(event, {});
                 });
 
             $controls = Ox.Element();
diff --git a/static/js/pandora/mainMenu.js b/static/js/pandora/mainMenu.js
index 90999e268..7f264ba97 100644
--- a/static/js/pandora/mainMenu.js
+++ b/static/js/pandora/mainMenu.js
@@ -230,13 +230,11 @@ pandora.ui.mainMenu = function() {
                     var iframe, src;
                     Ox.Theme(value);
                     pandora.UI.set('theme', value);
-                    iframe = $('#embed')[0];
+                    iframe = Ox.UI.elements[$('#embed').data('oxid')];
                     if (iframe) {
-                        src = $(iframe).attr('src');
+                        src = iframe.attr('src');
                         if (src && Ox.parseURL(src).hostname == document.location.hostname) {
-                            iframe.contentWindow.postMessage(JSON.stringify({
-                                theme: value
-                            }), '*');
+                            iframe.postMessage('settheme', {theme: value});
                         }
                     }
                 } else if (data.id == 'showsiteposters') {
diff --git a/static/js/pandora/textPanel.js b/static/js/pandora/textPanel.js
index 5e27e47bb..b6ae48e3c 100644
--- a/static/js/pandora/textPanel.js
+++ b/static/js/pandora/textPanel.js
@@ -321,17 +321,25 @@ pandora.ui.textHTML = function(text) {
 
 pandora.ui.textPDF = function(text) {
 
-    var that = Ox.Element();
+    var that = Ox.Element(),
+        $iframe;
     if (text.uploaded) {
-        $('<iframe>')
+        $iframe = Ox.Element('<iframe>')
             .attr({
-                height: '100%',
                 frameborder: 0,
+                height: '100%',
                 src: '/texts/' + pandora.user.ui.text + '/text.pdf.html',
                 width: '100%'
             })
-        .appendTo(that);
-
+            .onMessage(function(event, data) {
+                if(event == 'edit') {
+                    Ox.Dialog({
+                        title: 'edit',
+                        content: Ox.Element().html('test')
+                    }).open()
+                }
+            })
+            .appendTo(that);
     } else {
         that.html('UPLOADED: ' + text.uploaded);
     }
@@ -361,7 +369,7 @@ pandora.ui.textEmbed = function() {
             .hide()
             .appendTo(that),
 
-        $iframe = $('<iframe>')
+        $iframe = Ox.Element('<iframe>')
             .attr({
                 height: '100%',
                 id: 'embed',
@@ -397,9 +405,9 @@ pandora.ui.textEmbed = function() {
                 && parsed.url.protocol == parsed.src.protocol
                 && parsed.url.hostname == parsed.src.hostname
             ) {
-                $iframe[0].contentWindow.postMessage(JSON.stringify({
+                $iframe.postMessage('seturl', {
                     url: parsed.url.pathname + parsed.url.search + parsed.url.hash
-                }), '*');
+                });
             } else {
                 $iframe.attr({src: url});                
             }
diff --git a/static/pdf.js/embeds.js b/static/pdf.js/embeds.js
index 032e6833a..965b50fba 100644
--- a/static/pdf.js/embeds.js
+++ b/static/pdf.js/embeds.js
@@ -1,15 +1,6 @@
-window.addEventListener('message', function(event) {
-    if (event.origin != 'null' && event.data) {
-        var data = JSON.parse(event.data);
-        if (data.event == 'close') {
-            var element = document.getElementById(data.id);
-            Array.prototype.forEach.call(element.parentElement.getElementsByClassName('button'), function(element) {
-                if (editable || element.className == 'button playButton') {
-                    element.style.display = 'block';
-                }
-            });
-            e.parentElement.removeChild(e);
-        }
+Ox.Message.bind(function(event, data, oxid) {
+    if (Ox.isUndefined(oxid)) {
+        //process messages here
     }
 });
 
@@ -78,6 +69,9 @@ function getVideoOverlay(page) {
                 e.stopPropagation();
                 var videoId = 'video' + page + id,
                     $iframe = Ox.$('<iframe>')
+                        .on('load', function() {
+                            Ox.Message.post($iframe, 'init', {id: $iframe.oxid});
+                        })
                         .attr({
                             id: videoId,
                             src: getEmbedURL(videoId, video.src),
@@ -86,6 +80,17 @@ function getVideoOverlay(page) {
                             frameborder: 0
                         })
                         .appendTo($interface);
+                Ox.Message.bind(function(event, data, oxid) {
+                    if ($iframe.oxid == oxid) {
+                        if(event == 'close') {
+                            $iframe.remove();
+                        }
+                    }
+                });
+                $iframe.postMessage = function(event, data) {
+                    Ox.Message.post($iframe, event, data);
+                    return $iframe;
+                };
                 $playButton.hide();
                 $editButton.hide();
                 return false;
@@ -94,27 +99,39 @@ function getVideoOverlay(page) {
                 var url;
                 e.preventDefault();
                 e.stopPropagation();
-                
-                url = prompt(
-                    'Please enter a pan.do/ra video URL, like\n'
-                    + 'https://0xdb.org/0315594/00:13:37,00:23:42 or\n'
-                    + 'http://pad.ma/A/editor/00:00:00,00:01:00,00:02:00'
-                    + (video ? '\n\nTo remove the video, just remove the URL.' : ''),
-                    video ? video.src : ''
-                );
-                if (url !== null) {
-                    if(!video) {
-                        video = {
-                            page: page,
-                            id: id,
-                            src: ''
-                        };
-                        embeds.push(video);
+                if(window.parent) {
+                    Ox.$parent.postMessage('edit', {
+                        video: video
+                            ? video
+                            : {
+                                id: id,
+                                page: page,
+                                src: ''
+                            }
+                    });
+                } else {
+                    url = prompt(
+                        'Please enter a pan.do/ra video URL, like\n'
+                        + 'https://0xdb.org/0315594/00:13:37,00:23:42 or\n'
+                        + 'http://pad.ma/A/editor/00:00:00,00:01:00,00:02:00'
+                        + (video ? '\n\nTo remove the video, just remove the URL.' : ''),
+                        video ? video.src : ''
+                    );
+                    if (url !== null) {
+                        if(!video) {
+                            video = {
+                                page: page,
+                                id: id,
+                                src: ''
+                            };
+                            embeds.push(video);
+                        }
+                        video.src = url
+                        saveVideoOverlay();
+                        url !== '' ? enableVideoUI() : disableVideoUI()
                     }
-                    video.src = url
-                    saveVideoOverlay();
-                    url !== '' ? enableVideoUI() : disableVideoUI()
                 }
+
                 return false;
             }
             function enableVideoUI() {