diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss
index 825793e48..11eac26a5 100644
--- a/resources/assets/sass/_forms.scss
+++ b/resources/assets/sass/_forms.scss
@@ -109,6 +109,8 @@ input[type="text"], input[type="number"], input[type="email"], input[type="searc
 }
 
 .search-box {
+  max-width: 100%;
+  position: relative;
   button {
     background-color: transparent;
     border: none;
@@ -124,5 +126,6 @@ input[type="text"], input[type="number"], input[type="email"], input[type="searc
   input {
     padding-right: $-l;
     width: 300px;
+    max-width: 100%;
   }
 }
\ No newline at end of file
diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index 968f9ea9a..3f730ef38 100644
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -39,16 +39,16 @@
     <header id="header">
         <div class="container">
             <div class="row">
-                <div class="col-md-4">
+                <div class="col-md-4 col-sm-3">
                     <a href="/" class="logo">{{ Setting::get('app-name', 'BookStack') }}</a>
                 </div>
-                <div class="col-md-4 text-center">
+                <div class="col-md-4 col-sm-3 text-center">
                     <form action="/search/all" method="GET" class="search-box">
                         <input type="text" name="term" tabindex="2" value="{{ isset($searchTerm) ? $searchTerm : '' }}">
                         <button class="text-button"><i class="zmdi zmdi-search"></i></button>
                     </form>
                 </div>
-                <div class="col-md-4">
+                <div class="col-md-4 col-sm-6">
                     <div class="float right">
                         <div class="links text-center">
                             <a href="/books"><i class="zmdi zmdi-book"></i>Books</a>
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index bd4351e0a..a35aa5abe 100644
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -56,9 +56,18 @@
             menubar: false,
             //height: 700,
             extended_valid_elements: 'pre[*]',
-            plugins: "image table textcolor paste link imagetools fullscreen code",
-            toolbar: "code undo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link | fullscreen",
+            plugins: "image table textcolor paste link imagetools fullscreen code hr",
+            toolbar: "code undo | styleselect | hr bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link | fullscreen",
             content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
+            style_formats: [
+                {title: "Header 1", format: "h1"},
+                {title: "Header 2", format: "h2"},
+                {title: "Header 3", format: "h3"},
+                {title: "Header 4", format: "h4"},
+                {title: "Paragraph", format: "p"},
+                {title: "Blockquote", format: "blockquote"},
+                {title: "Code Block", icon: "code", format: "pre"}
+            ],
             file_browser_callback: function(field_name, url, type, win) {
                 ImageManager.show(function(image) {
                     win.document.getElementById(field_name).value = image.url;
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 7656085e9..5fa41eff8 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -5,7 +5,7 @@
     <div class="faded-small">
         <div class="container">
             <div class="row">
-                <div class="col-md-6 faded">
+                <div class="col-sm-6 faded">
                     <div class="breadcrumbs">
                         <a href="{{$book->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->name }}</a>
                         @if($page->hasChapter())
@@ -17,7 +17,7 @@
                         @endif
                     </div>
                 </div>
-                <div class="col-md-6 faded">
+                <div class="col-sm-6 faded">
                     <div class="action-buttons">
                         @if($currentUser->can('page-update'))
                             <a href="{{$page->getUrl() . '/revisions'}}" class="text-primary text-button"><i class="zmdi zmdi-replay"></i>Revisions</a>