diff --git a/templates/timeline/entries_summary.tpl b/templates/timeline/entries_summary.tpl
index 44f163ca..b49f9751 100644
--- a/templates/timeline/entries_summary.tpl
+++ b/templates/timeline/entries_summary.tpl
@@ -10,31 +10,27 @@
     <div class="archives_summary">
     {foreach from=$entries item="sentries" name="archivesummarylist"}
         {foreach from=$sentries.entries item="entry"}
-            {if $entry.body || $entry.extended || $entry.properties.timeline_image}
-                <div class="row each-archive-entry">
-                    
-                        <div class="col-md-2 archive-post-thumb">
-                            {if $entry.properties.timeline_image|is_in_string:'<iframe,<embed,<object'}{* we assume this is a video, just emit the contents of the var *}
-                                <div>{$entry.properties.timeline_image}</div>
-                            {else}
-                                <a href="{$entry.link}" title="{$entry.title}"><img class="img-thumbnail" {if $entry.properties.timeline_image}src="{$entry.properties.timeline_image}"{else}src="{serendipity_getFile file='img/image_unavailable.jpg'}"{/if} alt=""/></a>
-                            {/if}                        
-                        </div>
-                        <div class="col-md-10 archive-post-body">
-                            <h4><a href="{$entry.link}">{$entry.title}</a></h4>
-                            <p class="post-info"><span class="sr-only">{$CONST.POSTED_BY}</span>
-                                <span class="sr-only"> {$CONST.ON}</span><span class="entry-timestamp"><i class="fa fa-clock-o" aria-hidden="true"></i><time datetime="{$entry.timestamp|serendipity_html5time}">{$entry.timestamp|formatTime:$template_option.date_format}</time></span>
-                            </p>
-                            {if $entry.body}
-                                {$entry.body|strip_tags|truncate:180:" ..."}
-                            {else}
-                                {$entry.extended|strip_tags|truncate:180:" ..."}
-                            {/if}
-                        </div>
-
+            <div class="row each-archive-entry">
+                <div class="col-md-2 archive-post-thumb">
+                    {if $entry.properties.timeline_image|is_in_string:'<iframe,<embed,<object'}{* we assume this is a video, just emit the contents of the var *}
+                        <div>{$entry.properties.timeline_image}</div>
+                    {else}
+                        <a href="{$entry.link}" title="{$entry.title}"><img class="img-thumbnail" {if $entry.properties.timeline_image}src="{$entry.properties.timeline_image}"{else}src="{serendipity_getFile file='img/image_unavailable.jpg'}"{/if} alt=""/></a>
+                    {/if}                        
                 </div>
-                <hr>
-            {/if}
+                <div class="col-md-10 archive-post-body">
+                    <h4><a href="{$entry.link}">{$entry.title}</a></h4>
+                    <p class="post-info"><span class="sr-only">{$CONST.POSTED_BY}</span>
+                        <span class="sr-only"> {$CONST.ON}</span><span class="entry-timestamp"><i class="fa fa-clock-o" aria-hidden="true"></i><time datetime="{$entry.timestamp|serendipity_html5time}">{$entry.timestamp|formatTime:$template_option.date_format}</time></span>
+                    </p>
+                    {if $entry.body}
+                        {$entry.body|strip_tags|truncate:180:" ..."}
+                    {else}
+                        {$entry.extended|strip_tags|truncate:180:" ..."}
+                    {/if}
+                </div>
+            </div>
+            <hr>
         {/foreach}
     {/foreach}
     </div>
diff --git a/templates/timeline/index.tpl b/templates/timeline/index.tpl
index 80cd8e6e..26d01cb1 100644
--- a/templates/timeline/index.tpl
+++ b/templates/timeline/index.tpl
@@ -193,6 +193,13 @@
                         </div>
                     </div>
                 {else}
+                    {if !class_exists('serendipity_event_entryproperties')}
+                        <div id="search-block" class="row">
+                            <div class="col-md-10 col-md-offset-1 alert alert-danger">
+                                {$CONST.THEME_EP_NO}
+                            </div>
+                        </div>
+                    {/if}                
                     {$CONTENT}
                 {/if}
             </main>
diff --git a/templates/timeline/info.txt b/templates/timeline/info.txt
index 7bb6f11d..259d690c 100644
--- a/templates/timeline/info.txt
+++ b/templates/timeline/info.txt
@@ -1,6 +1,6 @@
 Name: Timeline
 Author: Don Chambers
-Date: 2016-04-20
+Date: 2016-06-14
 Require Serendipity: 2.0
 Backend: No
-Recommended: Yes
+Recommended: Yes
\ No newline at end of file
diff --git a/templates/timeline/style.css b/templates/timeline/style.css
index 1c23f7e5..0590e663 100644
--- a/templates/timeline/style.css
+++ b/templates/timeline/style.css
@@ -364,13 +364,13 @@ a, a:focus, a:hover, a:active, button, button:hover {
 
 .blogstyle-post-body {margin-top:20px;}
 
-.blogstyle-post-body h2{line-height: 1em; margin-top: 0;}
+.blogstyle-post-body h2{line-height: 1.2em; margin-top: 0; overflow: hidden;}
 
 /* archive summary - "view topics" */
 
 .archives_summary {margin-top:40px;}
 
-.archives_summary h4{line-height: 1em; margin: 0 0 4px 0;}
+.archives_summary h4{line-height: 1.2em; margin: 0 0 4px 0; overflow: hidden;}
 
 .archives_summary hr {margin: 10px 0}
 
@@ -574,6 +574,8 @@ a, a:focus, a:hover, a:active, button, button:hover {
     padding: 12px;
 }
 
+.timeline .timeline-body h2 {overflow:hidden;}
+
 .archive-archive_history .timeline .timeline-body {
     padding: 12px 6px;
 }