diff --git a/_includes/tiles.html b/_includes/tiles.html
index 39a8d7a..62892cd 100644
--- a/_includes/tiles.html
+++ b/_includes/tiles.html
@@ -1,28 +1,18 @@
+{% if 'posts' == site.tiles-source %}
+    {% assign tiles = site.posts %}
+{% elsif 'pages' == site.tiles-source %}
+    {% assign tiles = site.html_pages | where_exp: "item", "item.show_tile != false" %}
+{% endif %}
 <section id="one" class="tiles">
-  {% for post in site.posts limit:site.tiles-count %}
-  {% if site.tiles-source == 'posts' %}
+  {% for tile in tiles limit:site.tiles-count %}
   <article>
     <span class="image">
-      <img src="{{ post.image }}" alt="" />
+      <img src="{{ tile.image }}" alt="" />
     </span>
     <header class="major">
-      <h3><a href="{{ post.url  | relative_url }}" class="link">{{ post.title }}</a></h3>
+      <h3><a href="{{ tile.url  | relative_url }}" class="link">{{ tile.title }}</a></h3>
       <p>{{ post.description }}</p>
     </header>
   </article>
-  {% endif %}
-  {% endfor %}
-  {% for page in site.html_pages limit:site.tiles-count %}
-  {% if site.tiles-source == 'pages' and page.show_tile != false %}
-  <article>
-    <span class="image">
-      <img src="{{ page.image }}" alt="" />
-    </span>
-    <header class="major">
-      <h3><a href="{{ page.url | relative_url  }}" class="link">{{ page.title }}</a></h3>
-      <p>{{ page.description }}</p>
-    </header>
-  </article>
-  {% endif %}
   {% endfor %}
 </section>