diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 48d9e23..f06d1c4 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -15,14 +15,13 @@
                 </section>
             </article>
             <footer id="post-meta" class="clearfix">
-                <!-- TODO: Add support for twitter with conditional behavior -->
                 {{ with .Site.Params.twitter }}<a href="http://twitter.com/{{ . }}">{{ end }}
-                    <img class="avatar" src="{{ .Site.BaseURL }}images/avatar.png">
-                    <div>
-                        <span class="dark">{{ .Site.Params.name }}</span>
-                        <span>{{ .Site.Params.bio }}</span>
-                    </div>
-                {{ with .Site.Params.twitter }}</a>{{ end }}
+                        <img class="avatar" src="{{ .Site.BaseURL }}images/avatar.png">
+                        <div>
+                            <span class="dark">{{ .Site.Params.name }}</span>
+                            <span>{{ .Site.Params.bio }}</span>
+                        </div>
+                    {{ with .Site.Params.twitter }}</a>{{ end }}
                 <section id="sharing">
                     {{ partial "share.html" . }}
                 </section>
diff --git a/layouts/index.html b/layouts/index.html
index 874c5fb..913866c 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -8,18 +8,9 @@
         <a href='/about'>About </a>
         <a class="cta" href="/feed.xml">Subscribe</a>
     </nav>
-    <div class="profile">
-        <section id="wrapper">
-            <header id="header">
-                <a href='/about'>
-                    <img id="avatar" class="2x" src="{{ .Site.BaseURL }}images/profile.png" />
-                </a>
-                <h1>Nick Balestra</h1>
-                <!-- <h2>Software engineer</h2> -->
-                <h2>Try. Fail. Learn. Repeat. </h2>
-            </header>
-        </section>
-    </div>
+
+    {{ partial "profile.html" . }}
+
     <section id="wrapper" class="home">
         <ul id="post-list">
             <li>
diff --git a/layouts/partials/profile.html b/layouts/partials/profile.html
new file mode 100644
index 0000000..7743448
--- /dev/null
+++ b/layouts/partials/profile.html
@@ -0,0 +1,11 @@
+<div class="profile">
+    <section id="wrapper">
+        <header id="header">
+            <a href='{{ .Site.BaseURL }}about'>
+                <img id="avatar" class="2x" src="{{ .Site.BaseURL }}images/avatar.png"/>
+            </a>
+            <h1>{{ .Site.Params.name }}</h1>
+            <h2>{{ .Site.Params.bio }}</h2>
+        </header>
+    </section>
+</div>
\ No newline at end of file