diff --git a/Gemfile b/Gemfile
index 8b7105ac..41c25080 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ gem 'rubytree'
 gem 'sass-rails', '~> 4.0.3'
 gem 'sdoc', '~> 0.4.0', group: :doc
 gem 'slim'
-gem 'pagedown-rails', '~> 1.1.4'
+gem "bootstrap_pagedown"
 gem 'sorcery'
 gem 'thread_safe'
 gem 'turbolinks'
diff --git a/Gemfile.lock b/Gemfile.lock
index 97c6b626..ea22935c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,6 +48,8 @@ GEM
       debug_inspector (>= 0.0.1)
     bootstrap-will_paginate (0.0.10)
       will_paginate
+    bootstrap_pagedown (1.1.0)
+      rails (>= 3.2)
     builder (3.2.2)
     byebug (8.2.2)
     capistrano (3.3.5)
@@ -175,8 +177,6 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    pagedown-rails (1.1.4)
-      railties (> 3.1)
     parser (2.3.0.6)
       ast (~> 2.2)
     pg (0.18.4)
@@ -357,6 +357,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootstrap-will_paginate
+  bootstrap_pagedown
   byebug
   capistrano (~> 3.3.0)
   capistrano-rails
@@ -384,7 +385,6 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri
   nyan-cat-formatter
-  pagedown-rails (~> 1.1.4)
   pg
   pry
   puma (~> 2.15.3)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index ef5b9fc2..175fa4da 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -21,7 +21,5 @@
 //= require turbolinks
 //= require_tree ../../../lib
 //= require_tree .
-//= require markdown.converter
-//= require markdown.sanitizer
-//= require markdown.editor
+//= require bootstrap_pagedown
 
diff --git a/app/assets/javascripts/markdown_editor.js b/app/assets/javascripts/markdown_editor.js
index 08fe1e60..702450d5 100644
--- a/app/assets/javascripts/markdown_editor.js
+++ b/app/assets/javascripts/markdown_editor.js
@@ -1,19 +1,8 @@
-(function() 
-{
-  var converter = Markdown.getSanitizingConverter();
-  var editor = new Markdown.Editor(converter);
-  editor.run();
-/*  
-	window.MarkdownEditor = function(selector) 
-	{
-    ace.config.set('modePath', ACE_FILES_PATH);
-    var editor = ace.edit($(selector).next()[0]);
-    editor.on('change', function(){ $(selector).val(editor.getValue()); });
-    editor.setShowPrintMargin(false);
-    var session = editor.getSession();
-    session.setMode('markdown');
-    session.setUseWrapMode(true);
-    session.setValue($(selector).val());
- };
- */
-})();
+$(document).ready(function () {
+    var converter = Markdown.getSanitizingConverter();
+    var editor    = new Markdown.Editor( converter );
+
+    Markdown.Extra.init( converter );
+
+    editor.run();
+});
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index f11a8dd8..e21a40df 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -14,5 +14,5 @@
  *= require_tree ../../../lib
  *= require_tree ../../../vendor/assets/stylesheets/
  *= require_self
- *= require markdown 
+ *= require bootstrap_pagedown
 */
diff --git a/app/views/exercises/_form.html.slim b/app/views/exercises/_form.html.slim
index b67fe821..b160c5d5 100644
--- a/app/views/exercises/_form.html.slim
+++ b/app/views/exercises/_form.html.slim
@@ -9,9 +9,12 @@
   .form-group
     = f.label(:description)
     = f.hidden_field(:description)
+    = f.pagedown_editor :description
+    /.form-control.markdown
     .wmd-panel
-      #wmd-button-bar
+      .wmd-button-bar
       textarea.wmd-input
+      .wmd-preview
     /=f.input :description, :as => :pagedown, :input_html => { :preview => true }
   .form-group
     = f.label(:execution_environment_id)