diff --git a/themes/godotengine/layouts/article.htm b/themes/godotengine/layouts/article.htm
index 95325b8567..8964a02aec 100755
--- a/themes/godotengine/layouts/article.htm
+++ b/themes/godotengine/layouts/article.htm
@@ -11,9 +11,34 @@ categoryPage = "article"
 <div class="container">
   <h1 class="intro-title"></h1>
   <div class="row news-section">
-      {% component 'blogPost' %}
-  </div>
+    <div class="col-md-3 text-center">
+  <span class="date-big">{{ post.published_at|date('d') }}</span><br/>
+  <span class="date-small">{{ post.published_at|date('M Y') }}</span>
+  <br/><br/>
+  <p><img src="{{ post.user.avatar.path }}" width="100px"/>
+  <br/>{{ post.user.full_name }}</p>
+</div>
+<div class="col-md-6">
+  <h1>{{ post.title }}</h1>
+  {% if post.featured_images.count %}
+      <div class="featured-images text-center">
+          {% for image in post.featured_images %}
+              <p>
+                  <img
+                      data-src="{{ image.filename }}"
+                      src="{{ image.path }}"
+                      alt="{{ image.description }}"
+                      style="width:100%" />
+              </p>
+          {% endfor %}
+          </div>
+  {% endif %}
+  {{ post.content_html|raw }}
+</div>
+</div>
+<div class="col-md-3">&nbsp;</div>
+</div>
 
 </div>
 {% partial "footer" %}
-</html>
\ No newline at end of file
+</html>
diff --git a/themes/godotengine/layouts/home.htm b/themes/godotengine/layouts/home.htm
index cf2c0b7c01..bc7e7ea2ef 100755
--- a/themes/godotengine/layouts/home.htm
+++ b/themes/godotengine/layouts/home.htm
@@ -13,6 +13,7 @@ postPage = "{{ :slug }}"
 <html>
 {% partial "head" %}
 {% partial "header" %}
+{% set posts = blogPosts.posts %}
 <div class="jumbotron-filter"></div>
 <div class="jumbotron">
   <div class="container">
@@ -32,7 +33,14 @@ postPage = "{{ :slug }}"
     </div>
     <div class="col-md-6 news-list">
       <h2>Latest news</h2>
-        {% component 'blogPosts' %}
+      {% for post in posts %}
+        <article class="news">
+          <div class="news-date"> {{ post.updated_at|date("M d, Y") }} </div>
+          <div class="news-title">
+            <a href="{{ 'article'|page({ slug: post.slug }) }}">{{ post.title }}</a>
+          </div>
+        </article>
+      {% endfor %}
       <a class="more-news" href="/news">More news »</a>
     </div>
   </div>
@@ -138,4 +146,4 @@ postPage = "{{ :slug }}"
   </div>
 </div>
 {% partial "footer" %}
-</html>
\ No newline at end of file
+</html>
