diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 63f55a0..82ac691 100755
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -32,18 +32,7 @@
     {{ partial "navbar" . }}
     {{- end }}
 
-    <div class="container">
-        <section class="section">
-            <div class="columns">
-                <div class="column is-8">
-                    {{ block "main" . }}{{ end }}
-                </div>
-                <div class="column is-4">
-                    {{ partial "sidebar" . }}
-                </div>
-            </div>
-        </section>
-    </div>
+    {{ block "main" . }}{{ end }}
 
     <footer class="footer">
         <div class="container">
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
new file mode 100644
index 0000000..e69de29
diff --git a/layouts/index.html b/layouts/index.html
index d9d2703..ebf71cd 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,11 +1,13 @@
-{{ define "main" }} {{ $paginator := .Paginate (where .Data.Pages "Section" "entry") 3 }}
-
-<div class="columns">
-    {{ range $paginator.Pages }}
-    <div class="column">
-        {{ .Render "summary" }}
-    </div>
-    {{ end }}
+{{ define "main" }}
+<div class="container">
+    <section class="section">
+        <div class="columns is-multiline">
+            {{ range sort .Site.Data.twitter "order" }}
+            <div class="column is-one-third">
+                {{ partial "widget/tweet.html" . }}
+            </div>
+            {{ end }}
+        </div>
+    </section>
 </div>
-
-{{ partial "pagination" . }} {{ end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/widget/tweet.html b/layouts/partials/widget/tweet.html
new file mode 100644
index 0000000..dd617e6
--- /dev/null
+++ b/layouts/partials/widget/tweet.html
@@ -0,0 +1,21 @@
+<a href="https://twitter.com/citraemu/status/{{ .id }}">
+    <div class="card">
+        <div class="card-content">
+            <div class="columns">
+                <div class="column is-2">
+                    <figure class="image is-square">
+                        <img src="{{ .Site.BaseURL}}/images/twitterAvatar.png" />
+                    </figure>
+                </div>
+                <div class="column">
+                    <p class="title is-4">{{ .author }}</p>
+                    <p class="subtitle is-6">
+                        <time datetime="2016-1-1">{{ .date }}</time> by @{{ .author }}</p>
+                </div>
+            </div>
+            <div class="content">
+                {{ .message }}
+            </div>
+        </div>
+    </div>
+</a>
\ No newline at end of file