diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl
index 8034c2a8..9dd769d2 100644
--- a/browser/components/markdown.styl
+++ b/browser/components/markdown.styl
@@ -54,7 +54,6 @@ body
   font-family helvetica, arial, sans-serif
   line-height 1.6
   overflow-x hidden
-  user-select all
   background-color $ui-noteDetail-backgroundColor
   .katex
     font 400 1.2em 'KaTeX_Main'
@@ -78,7 +77,6 @@ body
 li
   label.taskListItem
     margin-left -2em
-    background-color white
 div.math-rendered
   text-align center
 .math-failed
@@ -184,6 +182,8 @@ ul
     list-style-type circle
     &>li>ul
       list-style-type square
+ul.markdownIt-TOC, ul.markdownIt-TOC ul
+  list-style-type none
 ol
   list-style-type decimal
   padding-left 2em
diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js
index af68b0e3..c4939c06 100644
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -1,6 +1,7 @@
 import markdownit from 'markdown-it'
 import emoji from 'markdown-it-emoji'
 import math from '@rokt33r/markdown-it-math'
+import tocAndAnchor from "markdown-it-toc-and-anchor"
 import _ from 'lodash'
 
 const katex = window.katex
@@ -36,6 +37,9 @@ var md = markdownit({
 md.use(emoji, {
   shortcuts: {}
 })
+md.use(tocAndAnchor, {
+  anchorLink: false
+})
 md.use(math, {
   inlineRenderer: function (str) {
     let output = ''
diff --git a/package.json b/package.json
index 70feac66..68d96835 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "markdown-it-checkbox": "^1.1.0",
     "markdown-it-emoji": "^1.1.1",
     "markdown-it-footnote": "^3.0.0",
+    "markdown-it-toc-and-anchor": "^4.1.1",
     "md5": "^2.0.0",
     "mixpanel": "^0.4.1",
     "moment": "^2.10.3",