diff --git a/_layouts/speakers-by-year.html b/_layouts/speakers-by-year.html
index 14bb4262..432d592e 100644
--- a/_layouts/speakers-by-year.html
+++ b/_layouts/speakers-by-year.html
@@ -53,34 +53,36 @@ <h1>Talks</h1>
 {% for speaker in page_speakers %}
 
 <div class="row" id="{{speaker.name | slugify }}">
-  <div class="col-md-offset-2 col-md-8 section">
+  <div class="col-sm-offset-2 col-sm-8 col-xs-offset-1 col-xs-10 col-md-offset-2 col-md-8 section">
     <div class="row text-center col-md-offset-2 col-md-8">
       <h2>{{ speaker.title | strip }}</h2>
     </div>
     <div class="row">
       <div class="col-md-offset-2 col-md-8">
         <div class="row nested-row">
-          <div class="col-md-3">
+          <div class="col-xs-6 col-sm-4 col-md-4">
             <img src='/img/speakers/{{speaker.name | slugify | replace: '-', '_'}}.large.jpg' style='display:inline-block; vertical-align:top; margin-right:10px; border-radius:5px; height:100px; border: solid 1px #bbb;'/>
           </div>
-          <div class="col-md-8">
+          <div class="col-xs-6 col-sm-4 col-md-4">
             <p>
               <strong>{{ speaker.name }}</strong> <br />
               {{ speaker.role }} <br/>
               {{ speaker.company }} <br/>
-              {% if speaker.twitter %}
-              <p>
-                <a href="https://twitter.com/{{ speaker.twitter }}" class="twitter-follow-button" data-show-count="false">Follow @{{ speaker.twitter }}</a>
-              </p>
-              {% endif %}
-              {% if speaker.github %}
-              <!-- Place this tag where you want the button to render. -->
-              <p>
-                <a class="github-button" href="https://github.com/{{ speaker.github }}" aria-label="Follow @{{ speaker.github}} on GitHub">Follow @{{ speaker.github }}</a>
-              </p>
-              {% endif %}
             </p>
           </div>
+          <div class="col-sm-4 col-md-4 hidden-xs pull-right">
+            {% if speaker.twitter %}
+            <p>
+              <a href="https://twitter.com/{{ speaker.twitter }}" class="twitter-follow-button" data-show-count="false">Follow @{{ speaker.twitter }}</a>
+            </p>
+            {% endif %}
+            {% if speaker.github %}
+            <!-- Place this tag where you want the button to render. -->
+            <p>
+              <a class="github-button" href="https://github.com/{{ speaker.github }}" aria-label="Follow @{{ speaker.github}} on GitHub">Follow @{{ speaker.github }}</a>
+            </p>
+            {% endif %}
+          </div>
         </div>
       </div>
     </div>