diff --git a/src/MdToHTML.hs b/src/MdToHTML.hs
index 86557ce..b84e35b 100644
--- a/src/MdToHTML.hs
+++ b/src/MdToHTML.hs
@@ -49,9 +49,9 @@ instance Show MdToken where
   show Linebreak = "<br>"
   show SingleNewline = " "
   show HorizontalRule = "---------"
-  show (Blockquote token) = "<blockquote>" ++ show token ++ "</blockquote>"
-  show (UnordList tokens) = "UNORD" ++ concatMap show tokens
-  show (OrdList tokens) = "ORD" ++ concatMap show tokens
+  show (Blockquote tokens) = "<blockquote>" ++ concatMap show tokens ++ "</blockquote>"
+  show (UnordList tokens) = "<ul>" ++ concatMap (prepend "<li>" . append "</li>" . show) tokens ++ "</ul>"
+  show (OrdList tokens) = "<ol>" ++ concatMap (prepend "<li>" . append "</li>" . show) tokens ++ "</ol>"
   show (Code code) = show code
   show (Codeblock code) = show code
   show (Link txt url) = "<a href=\"" ++ getUrl url ++ "\">" ++ show txt ++ "</a>"