diff --git a/.gitignore b/.gitignore
index be86e5a0392..170fdf91203 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,8 @@ npm-debug.log
 yarn-error.log
 /public/dist
 /public/plugins
-/public/css
-/public/js
+/public/css/*.map
+/public/js/*.map
 /public/bower
 /public/build/
 /storage/images
@@ -21,3 +21,19 @@ nbproject
 .buildpath
 .project
 .settings/
+
+*.bat
+
+public/\.user\.ini
+
+public/web\.config
+
+public/\.well-known/
+
+public/css/export-styles\.css
+
+public/css/print-styles\.css
+
+public/css/styles\.css
+
+public/js/common\.js
diff --git a/config/app.php b/config/app.php
index 7e2e1487fb0..d57001ca3ac 100755
--- a/config/app.php
+++ b/config/app.php
@@ -7,7 +7,7 @@
     'editor' => env('APP_EDITOR', 'html'),
 
     'views' => [
-        'books' => env('APP_VIEWS_BOOKS', 'list')
+        'books' => env('APP_VIEWS_BOOKS', 'grid')
     ],
 
     /*
diff --git a/config/mail.php b/config/mail.php
index 0386e019841..128d83a449e 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -54,7 +54,7 @@
     |
     */
 
-    'from' => ['address' => env('MAIL_FROM', 'mail@bookstackapp.com'), 'name' => 'BookStack'],
+    'from' => ['address' => env('MAIL_FROM', 'mail@bookstackapp.com'), 'name' => env('MAIL_FROM_NAME', 'BootStack')],
 
     /*
     |--------------------------------------------------------------------------
diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index f7bfe22cf86..fad7aa374bc 100644
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -340,7 +340,7 @@ window.tinymce.PluginManager.add('customhr', function (editor) {
 });
 
 // Load plugins
-let plugins = "image table textcolor paste link autolink fullscreen imagetools code customhr autosave lists codeeditor";
+let plugins = "image table textcolor paste link autolink fullscreen imagetools code customhr autosave lists codeeditor media codesample visualblocks"; 
 codePlugin();
 if (document.querySelector('[drawio-enabled]').getAttribute('drawio-enabled') === 'true') {
     drawIoPlugin();
@@ -367,7 +367,7 @@ module.exports = {
     valid_children: "-div[p|h1|h2|h3|h4|h5|h6|blockquote],+div[pre],+div[img]",
     plugins: plugins,
     imagetools_toolbar: 'imageoptions',
-    toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr drawio | removeformat code fullscreen",
+    toolbar: "undo redo | styleselect visualblocks | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link media hr drawio | removeformat codesample code 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 Large", format: "h2"},
@@ -384,6 +384,20 @@ module.exports = {
             {title: "Warning", format: 'calloutwarning'},
             {title: "Danger", format: 'calloutdanger'}
         ]},
+    ],
+	codesample_dialog_width: '400',
+	codesample_dialog_height: '400',
+	codesample_languages: [
+        {text: 'HTML/XML', value: 'markup'},
+        {text: 'JavaScript', value: 'javascript'},
+        {text: 'CSS', value: 'css'},
+        {text: 'PHP', value: 'php'},
+        {text: 'Ruby', value: 'ruby'},
+        {text: 'Python', value: 'python'},
+        {text: 'Java', value: 'java'},
+        {text: 'C', value: 'c'},
+        {text: 'C#', value: 'csharp'},
+        {text: 'C++', value: 'cpp'}
     ],
     style_formats_merge: false,
     formats: {
diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index 0d8a5fad96a..e36cd61774a 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -61,8 +61,8 @@
         @if(count($books) > 0)
             @if($booksViewType === 'list')
                 @foreach($books as $book)
-                    @include('books/list-item', ['book' => $book])
-                    <hr>
+                    @include('books/grid-item', ['book' => $book])
+                    <hr />
                 @endforeach
                 {!! $books->render() !!}
             @else
diff --git a/version b/version
index 0507cd08e3b..d1c88d57f25 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v0.20-dev
+v0.20-dev
\ No newline at end of file