diff --git a/resources/assets/sass/_html.scss b/resources/assets/sass/_html.scss
index 3b019d583..6b21a48a7 100644
--- a/resources/assets/sass/_html.scss
+++ b/resources/assets/sass/_html.scss
@@ -11,3 +11,12 @@ body {
 	color: #444;
 	-webkit-font-smoothing: antialiased;
 }
+
+table {
+  min-width: 100px;
+  td {
+	min-width: 10px;
+	padding: 4px 6px;
+	border: 1px solid #DDD;
+  }
+}
\ No newline at end of file
diff --git a/resources/assets/sass/_tinymce.scss b/resources/assets/sass/_tinymce.scss
index 7c1cf771d..9c7c398cf 100644
--- a/resources/assets/sass/_tinymce.scss
+++ b/resources/assets/sass/_tinymce.scss
@@ -15,4 +15,8 @@
   position: fixed;
   top: 0;
   height: 100%;
+  width: 825px;
+  max-width: 100%;
+  margin-left: -$-s;
+  box-shadow: 0 0 4px 2px rgba(0, 0, 0, 0.08);
 }
\ No newline at end of file
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index 871344f63..a100bdbca 100644
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -47,10 +47,14 @@
             },
             setup: function(editor) {
                 editor.addButton('full', {
-                    text: 'Expand',
-                    icon: false,
+                    title: 'Expand Editor',
+                    icon: 'fullscreen',
                     onclick: function() {
                         var container = $(editor.getContainer()).toggleClass('fullscreen');
+                        var isFull = container.hasClass('fullscreen');
+                        var iframe = container.find('iframe').first();
+                        var height = isFull ? $(window).height()-110 : 600;
+                        iframe.css('height', height + 'px');
                     }
                 });
             }