diff --git a/templates/default/html/chart_page.twig b/templates/default/html/chart_page.twig
index 7f1b5ecc..ca846e75 100644
--- a/templates/default/html/chart_page.twig
+++ b/templates/default/html/chart_page.twig
@@ -8,3 +8,11 @@
     <script src="{{ base }}/public/js/timeline.js"></script>
     <link rel="stylesheet" type="text/css" href="{{ base }}/public/css/timeline.css">
 {% endblock %}
+{% block stylesheets %}
+{{ parent() }}
+<style type='text/css'>
+body {
+ margin: 0;
+}
+</style>
+{% endblock %}
diff --git a/templates/default/html/dashboard.twig b/templates/default/html/dashboard.twig
index 897b3602..65b46130 100644
--- a/templates/default/html/dashboard.twig
+++ b/templates/default/html/dashboard.twig
@@ -16,6 +16,9 @@
 {% block stylesheets %}
   {{ parent() }}
   <style>
+  #content {
+   width: auto;
+  }
   #reports_holder {
     margin-top: 20px;
   }
@@ -115,7 +118,10 @@ $.each(dashboard.reports, function(i,report) {
     holder = $("<iframe>").appendTo(container).css({
       border: 0,
       width: '100%'
-    }).iframeAutoHeight();
+    }).on('load',function() {
+	$(this).height($(this).get(0).contentWindow.document.body.scrollHeight);
+	$(this).width($(this).get(0).contentWindow.document.body.scrollWidth);
+    });
     
     if(report.style) holder.attr('style',holder.attr('style')+';'+report.style);
   }