diff --git a/public/css/style.css b/public/css/style.css
index 20bb688..7695388 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -8,6 +8,12 @@ html, body {
   font-size: 1em;
   line-height: 1.5em;
   background-color: #444;
+  height: 100%;
+  overflow: hidden;
+}
+
+body {
+  overscroll-behavior-y: none;
 }
 
 h1, h2, h3, h4, h5, h6, p {
@@ -34,9 +40,13 @@ img {
 }
 
 #header {
-  padding: 10px 0 ;
+  position: fixed;
+  z-index: 1000;
+  top: 0;
+  left: 0;
   background-color: #444;
   width: 100%;
+  padding: 10px;
   text-align: center;
 }
 
@@ -46,67 +56,34 @@ img {
 }
 
 #container {
-  min-height: 100%;
-  height: auto !important;
-  height: 100%;
-  width: 1100px;
-  padding: 20px;
+  position: absolute;
+  width: 100%;
   margin: 0 auto;
   background-color: #fff;
-  border-radius: 10px;
+  overflow: hidden;
 }
 
-#container .section {
-  margin-bottom: 20px;
+#editor-wrapper {
+  border-right: 10px solid #eee;
 }
 
-#content .mode {
-  border: 1px solid #ddd;
-  border-radius: 3px;
-  width: 535px;
-  display: inline-block;
-  vertical-align: top;
+#preview-wrapper {
+  padding-left: 10px;
 }
 
-#content .mode .content {
-  padding: 10px;
-}
-
-#preview {
-  margin-left: 20px;
-}
-
-#leftColumn {
-  float: left;
-  width: 700px;
-}
-
-#rightColumn {
-  width: 240px;
-  float: right;
-}
-
-textarea#markdown {
+.column {
   padding: 0;
   margin: 0;
-  width: 100%;
-  height: 400px;
-  overflow: auto;
-  font-size: 15px;
-  border: none;
-/*  border: 2px solid #D1D1BC;*/
-  resize: vertical;
-  outline: none;
+  white-space: nowrap;
+  display: inline-block;
+  width: 50%;
+  vertical-align: top;
+  overflow-y: scroll;
 }
 
-#editor {
-  width: 100%;
-} 
-
 #footer {
-  clear: both;
+  display :none;
   width: 100%;
-  padding: 10px;
   background-color: #444;
   color: #fff;
   text-align: center;
@@ -117,7 +94,6 @@ textarea#markdown {
   color: #999;
 }
 
-
 #footer #copyright a {
   font-size: 12px;
   color: #999;
diff --git a/public/index.html b/public/index.html
index 7a7b468..7a3be63 100644
--- a/public/index.html
+++ b/public/index.html
@@ -27,12 +27,10 @@
     </div>
 
     <div id="container">
-      <div id="content" class="section">
 
-        <div id="edit" class="mode">
-          <div class="content">
-
-            <div id="editor"># Markdown syntax guide
+      <div id="edit" class="column">
+        <div id="editor-wrapper">
+          <div id="editor"># Markdown syntax guide
 
 ## Headers
 
@@ -56,16 +54,16 @@ _You **can** combine them_
 
 * Item 1
 * Item 2
-  * Item 2a
-  * Item 2b
+* Item 2a
+* Item 2b
 
 ### Ordered
 
 1. Item 1
 1. Item 2
 1. Item 3
-    1. Item 3a
-    1. Item 3b
+  1. Item 3a
+  1. Item 3b
 
 ## Images
 
@@ -99,14 +97,12 @@ alert(message);
 ## Inline code
 
 This web site is using `markedjs/marked`.</div>
-          </div>
         </div>
-
-        <div id="preview" class="mode">
-          <div id="output" class="content markdown-body">
-          </div>
+      </div><!-- Do not insert new line here --><div id="preview" class="column">
+          <div id="preview-wrapper">
+            <div id="output" class="content markdown-body">
+          </div> 
         </div>
-
       </div>
     </div>
 
diff --git a/public/js/main.js b/public/js/main.js
index 591c9ef..47a8ea1 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -1,13 +1,28 @@
 $(function() {
-    var isEdited = false;
+    let isEdited = false;
+
+    let adjustScreen = () => {
+        let screenHeight = $(window).height();
+        let headerHeight = $('#header').outerHeight();
+        let containerHeight = screenHeight - headerHeight;
+        console.log(containerHeight);
+        $('#container').css({ top: `${headerHeight}px` });
+        $('#container').css({ height: `${containerHeight}px`});
+        $('.column').css({ height: `${containerHeight}px`});
+    };
+
+    $(window).resize(() => {
+        adjustScreen();
+    });
 
     // Setup editor
-    var editor = ace.edit('editor');
+    let editor = ace.edit('editor');
     editor.getSession().setUseWrapMode(true);
     editor.setOptions({
         maxLines: Infinity,
         indentedSoftWrap: false,
         fontSize: 14,
+        autoScrollEditorIntoView: true,
         theme: 'ace/theme/github',
         // TODO consider some options
     });
@@ -15,6 +30,7 @@ $(function() {
     editor.on('change', () => {
         isEdited = true;
         convert();
+        adjustScreen();
     });
 
     let convert = () => {
@@ -31,4 +47,5 @@ $(function() {
     });
 
     convert();
+    adjustScreen();
 });
\ No newline at end of file