diff --git a/index.php b/index.php
index 53028d114d51..eeba475a2f7b 100644
--- a/index.php
+++ b/index.php
@@ -6,46 +6,40 @@
  * @subpackage BootstrapWP
  */
 get_header(); ?>
-<div class="container">
-    <div class="row">
-        <?php if (function_exists('bootstrapwp_breadcrumbs')) {
-        bootstrapwp_breadcrumbs();
-    } ?>
-    </div>
-    <!--/.row -->
+<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
+    <div class="container">
+        <div class="row">
+            <div class="span12">
+                <?php if (function_exists('bootstrapwp_breadcrumbs')) {
+                    bootstrapwp_breadcrumbs();
+                } ?>
+            </div><!--/.span12 -->
+        </div><!--/.row -->
 
     <div class="row content">
         <div class="span8">
-            <?php
-// Blog post query
-            $paged = (get_query_var('paged')) ? get_query_var('paged') : 1;
-            query_posts(array('post_type' => 'post', 'paged' => $paged, 'showposts' => 0));
-            if (have_posts()) : while (have_posts()) : the_post(); ?>
-                <div <?php post_class(); ?>>
-                    <a href="<?php the_permalink(); ?>" title="<?php the_title();?>"><h3><?php the_title();?></h3></a>
+            <div <?php post_class(); ?>>
+                <a href="<?php the_permalink(); ?>" title="<?php the_title();?>">
+                    <h3><?php the_title();?></h3></a>
+                <p class="meta">
+                    <?php echo bootstrapwp_posted_on();?>
+                </p>
 
-                    <p class="meta"><?php echo bootstrapwp_posted_on();?></p>
-
-                    <div class="row">
-                        <div class="span2"><?php // Checking for a post thumbnail
-                            if (has_post_thumbnail()) ?>
-                                    <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
-                            <?php the_post_thumbnail();?></a>
-                        </div>
-                        <!-- /.span2 -->
-                        <div class="span6">
-                            <?php the_excerpt();?>
-                        </div>
-                        <!-- /.span6 -->
-                    </div>
-                    <!-- /.row -->
-                    <hr/>
-                </div><!-- /.post_class -->
-                <?php endwhile; endif; ?>
+                <div class="row">
+                    <div class="span2">
+                        <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
+                            <?php echo bootstrapwp_autoset_featured_img(); ?></a>
+                    </div><!-- /.span2 -->
+                    <div class="span6">
+                        <?php the_excerpt();?>
+                    </div><!-- /.span6 -->
+                </div><!-- /.row -->
+                <hr/>
+            </div><!-- /.post_class -->
+            <?php endwhile; endif; ?>
 
             <?php bootstrapwp_content_nav('nav-below');?>
-        </div>
-        <!-- /.span8 -->
+        </div><!-- /.span8 -->
 
-        <?php get_sidebar('blog'); ?>
-        <?php get_footer(); ?>
+    <?php get_sidebar('blog'); ?>
+    <?php get_footer(); ?>
\ No newline at end of file