diff --git a/src/components/mde/MarkdownEditor.jsx b/src/components/mde/MarkdownEditor.jsx
index f2ff08973950087196d358d40fcd1f9a46d2dfda..266cc1cb7ccfc915c83024f5c594976a1c1f210b 100644
--- a/src/components/mde/MarkdownEditor.jsx
+++ b/src/components/mde/MarkdownEditor.jsx
@@ -17,7 +17,7 @@ const MarkdownEditor = ({
   const [selectedTab, setSelectedTab] = useState("write");
 
   const classes = {
-    preview: "content-block p-2 border border-grey-200",
+    preview: "p-2 content-block text-input",
     textArea: "p-2 text-input text-base",
   };
 
diff --git a/src/components/posts/PostEditModal.jsx b/src/components/posts/PostEditModal.jsx
index d2b00e7e3f4bc9d7fdea8a290743d1e542adcae5..585312114df181b78cd900f7e887cbccfce6d74e 100644
--- a/src/components/posts/PostEditModal.jsx
+++ b/src/components/posts/PostEditModal.jsx
@@ -52,6 +52,11 @@ const PostEditModal = ({
                 : null
             }
             placeholder="Vyplňte text příspěvku"
+            toolbarCommands={[
+              ["header", "bold", "italic", "strikethrough"],
+              ["link", "quote", "image"],
+              ["unordered-list", "ordered-list"],
+            ]}
           />
           {error && (
             <ErrorMessage className="mt-2">
diff --git a/src/containers/AddPostForm.jsx b/src/containers/AddPostForm.jsx
index 2e3fedf098985ce6e59aad359fabaf2c57d3335d..5d39a8535cc7628e4ae1808b63414722033267be 100644
--- a/src/containers/AddPostForm.jsx
+++ b/src/containers/AddPostForm.jsx
@@ -92,6 +92,11 @@ const AddPostForm = ({ className }) => {
             : null
         }
         placeholder="Vyplňte text vašeho příspěvku"
+        toolbarCommands={[
+          ["header", "bold", "italic", "strikethrough"],
+          ["link", "quote", "image"],
+          ["unordered-list", "ordered-list"],
+        ]}
       />
 
       <div className="space-x-4">
diff --git a/src/markdown.js b/src/markdown.js
index 559427cef5a0542cd2e59a33f18b1465acf1adf4..f501eecdbcde686e64d891687883fd6156b2f80e 100644
--- a/src/markdown.js
+++ b/src/markdown.js
@@ -12,7 +12,7 @@ export const markdownConverter = new Showdown.Converter({
   tables: true,
   simplifiedAutoLink: true,
   strikethrough: true,
-  tasklists: true,
+  tasklists: false,
   omitExtraWLInCodeBlocks: true,
   noHeaderId: true,
   headerLevelStart: 2,