diff --git a/mpicms/base/templatetags/md_tags.py b/mpicms/base/templatetags/md_tags.py
index 1742044..ceef597 100644
--- a/mpicms/base/templatetags/md_tags.py
+++ b/mpicms/base/templatetags/md_tags.py
@@ -4,6 +4,7 @@
 from markdown.extensions.nl2br import Nl2BrExtension
 from markdown.extensions.sane_lists import SaneListExtension
 from markdown.extensions.smarty import SmartyExtension
+from markdown.extensions.admonition import AdmonitionExtension
 from markdown.extensions.toc import TocExtension
 
 from django import template
@@ -19,10 +20,11 @@ def markdown(text):
         md_processor = md_module.Markdown(
             extensions=[
                 ExtraExtension(),
-                CodeHiliteExtension(),
+                CodeHiliteExtension(guess_lang=False),
                 Nl2BrExtension(),
                 SaneListExtension(),
                 SmartyExtension(smart_angled_quotes=True),
+                AdmonitionExtension(),
                 TocExtension(),
             ]
         )
diff --git a/mpicms/static/css/custom.css b/mpicms/static/css/custom.css
index 62ff3a4..323b80b 100644
--- a/mpicms/static/css/custom.css
+++ b/mpicms/static/css/custom.css
@@ -736,3 +736,7 @@ a.tag:hover {
 .modal-image:hover, .richtext-image:hover {
   cursor: pointer;
 }
+
+div.codehilite:not(:last-child) {
+	margin-bottom: 1em;
+}
diff --git a/mpicms/templates/wagtailadmin/pages/edit.html b/mpicms/templates/wagtailadmin/pages/edit.html
new file mode 100644
index 0000000..be8b615
--- /dev/null
+++ b/mpicms/templates/wagtailadmin/pages/edit.html
@@ -0,0 +1,9 @@
+{% extends "wagtailadmin/pages/edit.html" %}
+{% block extra_css %}
+{{ block.super }}
+<style>
+.fieldname-markdown textarea {
+	font-family: monospace;
+}
+</style>
+{% endblock %}