diff --git a/app/assets/images/marketing/clyfe.jpg b/app/assets/images/marketing/clyfe.jpg
new file mode 100644
index 0000000..9879a76
Binary files /dev/null and b/app/assets/images/marketing/clyfe.jpg differ
diff --git a/app/assets/images/marketing/zooz.jpg b/app/assets/images/marketing/zooz.jpg
new file mode 100644
index 0000000..353a2fc
Binary files /dev/null and b/app/assets/images/marketing/zooz.jpg differ
diff --git a/app/views/public/pages/team.html.erb b/app/views/public/pages/team.html.erb
index 062d907..ea55036 100644
--- a/app/views/public/pages/team.html.erb
+++ b/app/views/public/pages/team.html.erb
@@ -4,9 +4,55 @@
 
 <div class="row">
   <div class="col-lg-6">
-    <%= render :partial => 'public/pages/team/zooz' %>
+    <div class="clearfix">
+      <%= image_tag 'marketing/zooz.jpg', class: 'pull-left img-rounded', 
+          style: 'height: 80px; margin-right: 1em;' %>
+      <h4>Vaidas Jablonskis <small>System Administrator</small></h4>
+      <ul class="list-unstyled">
+        <li>
+          <a href="https://twitter.com/vaijab" class="twitter-follow-button">Follow @vaijab</a>
+          <script src="//platform.twitter.com/widgets.js" type="text/javascript"></script>
+        </li>
+        <li>
+          <a href="http://jablonskis.org/">http://jablonskis.org/</a>
+        </li>
+      </ul>
+    </div>
+    <p>
+      He began his career as a Linux systems user and quickly became involved with 
+      open source technologies.
+    </p>
+    <p>
+      Vaidas currently works as a Linux Systems Administrator 
+      for a London based company. He is greatly involved in Linux and free software 
+      community and is always interested in giving something back.
+    </p>
   </div>
   <div class="col-lg-6">
-    <%= render :partial => 'public/pages/team/clyfe' %>
+    <div class="clearfix">
+      <%= image_tag 'marketing/clyfe.jpg', class: 'pull-left img-rounded', 
+          style: 'height: 80px; margin-right: 1em;' %>
+      <h4>Claudius Nicolae <small>Software Developer</small></h4>
+      <ul class="list-unstyled">
+        <li>
+          <a href="https://twitter.com/_clyfe" class="twitter-follow-button">Follow @_clyfe</a>
+          <script src="//platform.twitter.com/widgets.js" type="text/javascript"></script>
+        </li>
+        <li>
+          <a href="https://github.com/clyfe">https://github.com/clyfe</a>
+        </li>
+      </ul>
+    </div>
+    <p>
+      He has a 
+      <em>Msc in Software Engineering</em> and a
+      <em>Bsc in Mathematics and Computer Science</em> from the
+      <em>University of Bucharest</em>.
+    </p>
+    <p>
+      He worked with many programming languages and technologies from web applications to
+      kernel-mode code on both Linux and Windows platforms, and generally, he favors using
+      open source software.
+    </p>
   </div>
 </div>
diff --git a/app/views/public/pages/team/_clyfe.html.erb b/app/views/public/pages/team/_clyfe.html.erb
deleted file mode 100644
index c160ef0..0000000
--- a/app/views/public/pages/team/_clyfe.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<h4>Claudius Nicolae <small>Programmer</small></h4>
-
-<p>
-  He is a software developer from Romania.
-</p>
-<p>
-  He has a 
-  <em>Masters in Software Engineering</em> and a
-  <em>Bachelors in Mathematics and Computer Science</em> from the
-  <em>University of Bucharest</em>.
-</p>
-<p>
-  He worked with many programming languages and technologies from web applications to
-  kernel-mode code on both Linux and Windows platforms, and generally, he favors using
-  open source software for most problems.
-</p>
-<p>
-  You can find him online at:
-</p>
-
-<ul>
-  <li>
-    <a href="https://twitter.com/_clyfe" class="twitter-follow-button">Follow @_clyfe</a>
-    <script src="//platform.twitter.com/widgets.js" type="text/javascript"></script>
-  </li>
-  <li>
-    <a href="https://github.com/clyfe">https://github.com/clyfe</a>
-  </li>
-</ul>
diff --git a/app/views/public/pages/team/_zooz.html.erb b/app/views/public/pages/team/_zooz.html.erb
deleted file mode 100644
index 81023fe..0000000
--- a/app/views/public/pages/team/_zooz.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<h4>Vaidas Jablonskis <small>System Administrator</small></h4>
-
-<p>
-  He began his career as a Linux systems user and quickly became involved with 
-  open source technologies.
-</p>
-<p>
-  Vaidas currently works as a Linux Systems Administrator 
-  for a London based company. He is greatly involved in Linux and free software 
-  community and is always interested in giving something back.
-</p>
-
-<p>
-  You can find him online at:
-</p>
-
-<ul>
-  <li>
-    <a href="https://twitter.com/vaijab" class="twitter-follow-button">Follow @vaijab</a>
-    <script src="//platform.twitter.com/widgets.js" type="text/javascript"></script>
-  </li>
-  <li>
-    <a href="http://jablonskis.org/">http://jablonskis.org/</a>
-  </li>
-</ul>