diff --git a/templates/article.html b/templates/article.html
index b27912a..316d968 100755
--- a/templates/article.html
+++ b/templates/article.html
@@ -29,7 +29,11 @@
                 <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
                     <div class="post-heading">
                         <h1>{{ article.title }}</h1>
-                        <h2 class="subheading">{{ article.summary }}</h2>
+                        {% if article.headline %}
+                            <h3 class="subheading">{{ article.headline }}</h3>
+                        {% else %}
+                            <h3 class="subheading">{{ article.summary|truncate(140) }}</h3>
+                        {% endif %}
                         <span class="meta">Posted by
                             {% for author in article.authors %}
                                 <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
diff --git a/templates/index.html b/templates/index.html
index 38cbae5..388840e 100755
--- a/templates/index.html
+++ b/templates/index.html
@@ -31,7 +31,7 @@
                 </h2>
             </a>
             {% if article.summary %}
-                {{ article.summary|truncate(25) }}
+                {{ article.summary|truncate(140) }}
             {% endif %}
             <p class="post-meta">Posted by
                 {% for author in article.authors %}