diff --git a/server/libs/markdown.js b/server/libs/markdown.js
index 178fb4d2..2fd6138b 100644
--- a/server/libs/markdown.js
+++ b/server/libs/markdown.js
@@ -25,10 +25,10 @@ var mkdown = md({
       try {
         return '<pre class="hljs"><code>' + hljs.highlight(lang, str, true).value + '</code></pre>'
       } catch (err) {
-        return '<pre><code>' + str + '</code></pre>'
+        return '<pre><code>' + _.escape(str) + '</code></pre>'
       }
     }
-    return '<pre><code>' + str + '</code></pre>'
+    return '<pre><code>' + _.escape(str) + '</code></pre>'
   }
 })
   .use(mdEmoji)
diff --git a/server/locales/en/common.json b/server/locales/en/common.json
index 1b6a44fd..9cd4441d 100644
--- a/server/locales/en/common.json
+++ b/server/locales/en/common.json
@@ -17,25 +17,26 @@
   },
   "nav": {
     "account": "Account",
-    "settings": "Settings",
+    "allpages": "All Pages",
+    "create": "Create",
+    "discard": "Discard",
+    "edit": "Edit",
+    "history": "History",
+    "home": "Home",
+    "login": "Login",
+    "logout": "Logout",
+    "move": "Move",
     "myprofile": "My Profile",
+    "normalview": "Normal View",
+    "savechanges": "Save Changes",
+    "savedocument": "Save Document",
+    "settings": "Settings",
+    "source": "Source",
     "stats": "Stats",
     "syssettings": "System Settings",
     "theme": "Color Theme",
     "users": "Users",
-    "logout": "Logout",
-    "create": "Create",
-    "edit": "Edit",
-    "history": "History",
-    "source": "Source",
-    "move": "Move",
-    "allpages": "All Pages",
-    "login": "Login",
-    "normalview": "Normal View",
-    "viewlatest": "View Latest",
-    "discard": "Discard",
-    "savechanges": "Save Changes",
-    "savedocument": "Save Document"
+    "viewlatest": "View Latest"
   },
   "welcome": {
     "title": "Welcome to your wiki!",
@@ -46,4 +47,4 @@
     "source": "Loading source...",
     "editor": "Loading editor..."
   }
-}
\ No newline at end of file
+}
diff --git a/server/views/pages/create.pug b/server/views/pages/create.pug
index 35fe41ca..7dddd2dd 100644
--- a/server/views/pages/create.pug
+++ b/server/views/pages/create.pug
@@ -16,7 +16,7 @@ block rootNavRight
 block content
   editor(inline-template, current-path=pageData.meta.path, v-cloak)
     .editor-area
-      textarea(ref='editorTextArea')= pageData.markdown
+      textarea(ref='editorTextArea', v-pre)= pageData.markdown
 
   editor-video
   editor-codeblock
diff --git a/server/views/pages/edit.pug b/server/views/pages/edit.pug
index 63a12139..4d851c23 100644
--- a/server/views/pages/edit.pug
+++ b/server/views/pages/edit.pug
@@ -16,7 +16,7 @@ block rootNavRight
 block content
   editor(inline-template, current-path=pageData.meta.path, v-cloak)
     .editor-area
-      textarea(ref='editorTextArea')= pageData.markdown
+      textarea(ref='editorTextArea', v-pre)= pageData.markdown
 
   editor-video
   editor-codeblock
diff --git a/server/views/pages/view.pug b/server/views/pages/view.pug
index 6098557d..56bfb9c4 100644
--- a/server/views/pages/view.pug
+++ b/server/views/pages/view.pug
@@ -73,12 +73,11 @@ block content
               +tocMenu(pageData.tree)
 
         .column
-
           .hero
             h1.title#title= pageData.meta.title
             if pageData.meta.subtitle
               h2.subtitle= pageData.meta.subtitle
-          .content.mkcontent
+          .content.mkcontent(v-pre)
             != pageData.html
 
   modal-create-page(basepath=pageData.meta.path)