diff --git a/generator.py b/generator.py
index 87dd68d..e113377 100755
--- a/generator.py
+++ b/generator.py
@@ -12,6 +12,9 @@ import argparse, json, os, re, shutil
 from datetime import datetime
 from jinja2 import Environment, FileSystemLoader
 
+import sys
+reload(sys); sys.setdefaultencoding('utf-8')
+
 def fromunixtime(value):
     return datetime.fromtimestamp(value).strftime('%Y-%m-%d %H:%M:%S')
 
diff --git a/templates/thread.html.j2 b/templates/thread.html.j2
index 096bf75..71fc3d8 100644
--- a/templates/thread.html.j2
+++ b/templates/thread.html.j2
@@ -9,7 +9,9 @@
   <body>
       <h1>{{ thread.title }}</h1>
       {% for post in thread.posts %}
-      <h3><a href={{ "../../user/" + post.user.name |url_replacer + ".html" }}>{{ post.user.name }}</a> - {{ post.timestamp | fromunixtime }}</h3>
+      <a href="#{{ loop.index }}">{{ loop.index }} - </a>
+      <b><a name="{{ loop.index }}" href={{ "../../user/" + post.user.name |url_replacer + ".html" }}>{{ post.user.name }}</a></b>
+      <i>({{ post.timestamp | fromunixtime }})</i>
       <p>{{ post.message | tohtml }}</p>
       {% for attachment in post.attachments %}
         --<br>
