diff --git a/classes/Utils.php b/classes/Utils.php
index c96f8756a332bb1686e1ca95dc1e8cece3f17e38..144dfd4fba88ceeceeff8a6cf5303ef345e9167c 100644
--- a/classes/Utils.php
+++ b/classes/Utils.php
@@ -570,8 +570,6 @@ class Utils{
 	    Haanga::Load($viewFile, $vars);
 	  }catch(Exception $e){
 	    echo '<pre>';
-	    echo $e->getMessage();
-	    var_dump($vars);
 	    echo($e->getMessage()."' in ".$e->getFile().":".$e->getLine()."\nStack trace:\n".$e->getTraceAsString());
 	    echo '</pre>';
 	  }
diff --git a/classes/modules/adminModule.php b/classes/modules/adminModule.php
index 0d08ba6f84266f24913b99a011f6d6b1064a4a70..8456b9674e34f8f6f6c50f6b5b8705ce331b52b2 100644
--- a/classes/modules/adminModule.php
+++ b/classes/modules/adminModule.php
@@ -162,7 +162,18 @@ class AdminModule extends abstractModule{
     <div class='container'>
       <img src='../img/lodspeakr_logotype.png' style='opacity: 0.1; position: absolute; right:0px; top:60%'/>
 ";
-  private $foot ="    </div>
+  private $foot ="        <div id='embed-box' class='modal hide fade'>
+    <div class='modal-header'>
+    <button type='button' class='close' data-dismiss='modal' aria-hidden='true'>&times;</button>
+    <h3>Embed this code</h3>
+    </div>
+    <div id='embed-body' class='modal-body'>
+    
+    </div>
+    <div class='modal-footer'>
+    <a href='#' class='btn' data-dismiss='modal'>Close</a>
+    </div>
+    </div></div>
   </body>
 </html>
 ";
@@ -566,7 +577,8 @@ class AdminModule extends abstractModule{
       }
     }
     echo $this->head ."
-    <script type='application/javascript'>   
+    <script type='application/javascript'> 
+    var home='".$conf['basedir']."';
     $namespaces
     </script>
     <div class='row-fluid'>
@@ -596,7 +608,8 @@ class AdminModule extends abstractModule{
        </div>
        <div class='row-fluid'>
         <div class='span3'>
-         <a href='#' id='preview-button' class='hide'><button class='btn btn-success btn-large'>View component</button></a>
+         <p><a href='#' id='preview-button' class='hide'><button class='btn btn-success btn-large'>View component</button></a></p>
+         <p><button id='embed-button' class='btn btn-success btn-large hide'>Embed component</button></p>
         </div>
        </div>
       </div>
diff --git a/doc/examples/originalComponents/static/admin/js/editor.js b/doc/examples/originalComponents/static/admin/js/editor.js
index ae7329c8a2c25a43278f0ad8b38976c210cb436e..ad78f213bd11cf317aad240651286e4d8d6d39ff 100644
--- a/doc/examples/originalComponents/static/admin/js/editor.js
+++ b/doc/examples/originalComponents/static/admin/js/editor.js
@@ -206,6 +206,7 @@ $(document).ready(function(){
       $("#template-list").empty();
       $("#query-list").empty();
       $("#preview-button").attr("target", "_new").attr("href", "../"+componentName).removeClass("hide");
+      $("#embed-button").attr("data-url", "../"+componentName).removeClass("hide");
       $.each(data.views, function(i, item){
           var viewUrl = relPos+componentType+"/"+componentName+"/"+item;
           var viewFileUrl = componentType+"/"+componentName+"/"+item;
@@ -378,5 +379,12 @@ $(document).ready(function(){
          $("#query-save-button").addClass('disabled');
        }
    });
+   
+   $("#embed-button").on('click', function(e){
+                   var url = $(this).attr('data-url').replace("../", home);
+                   var code = "&lt;iframe src='"+url+"' style='overflow-x: hidden;overflow-y: hidden;' frameborder='0' width='600px' height='400px'&gt;&lt;/iframe&gt;";
+                   $("#embed-body").html(code);
+                   $("#embed-box").modal('show');
+   })
  }
 });