diff --git a/wp-content/themes/aktiv2014/index.php b/wp-content/themes/aktiv2014/index.php
index ad189c1..74b8f8a 100644
--- a/wp-content/themes/aktiv2014/index.php
+++ b/wp-content/themes/aktiv2014/index.php
@@ -20,13 +20,19 @@
 
     <?php the_post_thumbnail(); ?>
 
-    <?php if( is_single() || is_page() ): ?>
+    <?php if( is_single() || is_page() || is_home() ): ?>
         <div class="entry-content"><?php the_content(); ?></div> <!-- .entry-content -->
-        <?php comments_template(); ?>
     <?php else: ?>
         <div class="entry-content"><?php the_excerpt(); ?></div> <!-- .entry-content -->
     <?php endif; ?>
 
+    <?php if( is_single() ): ?>
+        <?php comments_template(); ?>
+    <?php elseif( !is_page() ): ?>
+        <span class="comments-link"><?php comments_popup_link(); ?></span>
+    <?php endif; ?>
+
+
     </div>
     </article> <!-- .post -->