diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index d3b18df85..cbebfdd68 100644
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -15,7 +15,7 @@ module.exports = {
     automatic_uploads: false,
     valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",
     plugins: "image table textcolor paste link imagetools fullscreen code hr",
-    toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link hr | code fullscreen",
+    toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link hr | removeformat 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 1", format: "h1"},
@@ -27,6 +27,11 @@ module.exports = {
         {title: "Code Block", icon: "code", format: "pre"},
         {title: "Inline Code", icon: "code", inline: "code"}
     ],
+    formats : {
+        alignleft : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'align-left'},
+        aligncenter : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'align-center'},
+        alignright : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'align-right'},
+    },
     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/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index c4b2b05e1..9eee9c1b8 100644
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -17,10 +17,26 @@
 
 .page-content {
   max-width: 840px;
+  .align-left {
+    float: left !important;
+    text-align: left;
+    margin: $-xs $-s $-xs 0;
+  }
+  .align-right {
+    float: right !important;
+    text-align: right;
+    margin: $-xs 0 $-xs $-s;
+  }
+  .align-center {
+    text-align: center;
+  }
   img {
     max-width: 100%;
     height:auto;
   }
+  h1, h2, h3, h4, h5, h6 {
+    clear: both;
+  }
 }
 
 // Page content pointers