diff --git a/contact.html b/contact.html
index e7f5b99..74ac363 100644
--- a/contact.html
+++ b/contact.html
@@ -128,7 +128,7 @@ <h3>SDK &amp; Command Line Tools</h3>
                 <h4>André Rodrigues</h4>
                 <p><em>Software Development Engineer</em><br />
                     Lisbon, Portugal<br />
-                    <small>Node.js SDK</small></p>
+                    <small>Node.js SDK, x-plat CLI</small></p>
                 <p><a 
                     href="https://twitter.com/andremrodrigues" 
                     class="twitter-follow-button" 
@@ -150,7 +150,7 @@ <h4>Glenn Block</h4>
                 <h4>Jeff Wilcox</h4>
                 <p><em>Development Lead</em><br />
                     Seattle, WA<br />
-                    <small>SDK dev team lead</small></p>
+                    <small>Windows Azure SDK dev team lead</small></p>
                 <p><a 
                     href="https://twitter.com/jeffwilcox" 
                     class="twitter-follow-button" 
@@ -163,28 +163,63 @@ <h4>Jeff Wilcox</h4>
                 <h4>Tomasz Janczuk</h4>
                 <p><em>Principal Software Development Engineer</em><br />
                     Redmond, WA<br />
-                    <small>iisnode &amp; mobile services dev</small></p>
+                    <small>iisnode, Node.js &amp; Mobile Services dev</small></p>
                 <p><a 
                     href="https://twitter.com/tjanczuk" 
                     class="twitter-follow-button" 
                     data-show-count="false">Follow @tjanczuk</a>
                 </p>
             </td>
-            <td></td>
+            <td>
+                <h4>Guang Yang</h4>
+                <p><em>Program Manager</em><br />
+                    Redmond, WA<br />
+                    <small>Windows Azure PowerShell, CLI; Node.js, Java SDK</small></p>
+                <p><a 
+                    href="https://twitter.com/guayan" 
+                    class="twitter-follow-button" 
+                    data-show-count="false">Follow @guayan</a>
+                </p>
+            </td>
+            <td>
+                <h4>Mohit Srivastava</h4>
+                <p><em>Lead Program Manager</em><br />
+                    Seattle, WA<br />
+                    <small>SDK PM team lead</small></p>
+                <p><a 
+                    href="https://twitter.com/mohit" 
+                    class="twitter-follow-button" 
+                    data-show-count="false">Follow @mohit</a>
+                </p>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <h4>Albert Cheng</h4>
+                <p><em>Software Engineer</em><br />
+                    Redmond, WA<br />
+                    <small>Windows Azure SDK for Java &amp; PHP</small></p>
+                <p><a 
+                    href="https://twitter.com/chengg1978" 
+                    class="twitter-follow-button" 
+                    data-show-count="false">Follow @chengg1978</a>
+                </p>
+            </td>
+            <td></td>    
             <td></td>
         </tr>
         </tbody>
         </table>
 
-        <h3>Mobile Services</h3>
+        <h3>Windows Azure Mobile Services</h3>
         <table class="table table-bordered twitter-cards">
         <tbody>
         <tr>
             <td>
                 <h4>Josh Twist</h4>
-                <p><em>Senior Program Manager</em><br />
-                    Seattle, WA<br />
-                    <small>Node.js SDK</small></p>
+                <p><em>Program Manager</em><br />
+                    Redmond, WA<br />
+                    <small>Everything Mobile and Mobile Services</small></p>
                 <p><a 
                     href="https://twitter.com/joshtwist" 
                     class="twitter-follow-button" 
diff --git a/css/azureopensource.css b/css/azureopensource.css
index 1731377..24fad1d 100644
--- a/css/azureopensource.css
+++ b/css/azureopensource.css
@@ -29,8 +29,25 @@ h1 {
     color:  #333;
 }
 
-xx-section {
-    padding-top: 20px;
+.azure-nav-list {
+    width: 228px;
+    margin: 30px 0 0;
+    padding: 0;
+}
+
+.azure-nav-list > li > a {
+  display: block;
+  width: 190px;
+  margin: 0 0 -1px;
+  padding: 4px 12px;
+}
+
+.azure-nav-list.affix {
+  top: 40px;
+}
+
+section {
+    padding-top: 30px;
 }
 
 .twitter-cards > tbody > tr > td > h4,
@@ -60,3 +77,125 @@ xx-section {
   *display: inline;
   *zoom: 1;
 }
+
+/* Make tables spaced out a bit more */
+h2 + table,
+h3 + table,
+h4 + table,
+h2 + .row {
+  margin-top: 5px;
+}
+
+/* Responsive parts */
+
+/* Desktop large
+------------------------- */
+@media (min-width: 1200px) {
+  .azure-nav-list {
+    width: 258px;
+  }
+  .azure-nav-list > li > a {
+    width: 230px; /* Override the previous IE8-9 hack */
+  }
+}
+
+/* Desktop
+------------------------- */
+@media (max-width: 980px) {
+  /* Unfloat brand */
+  body > .navbar-fixed-top .brand {
+    float: left;
+    margin-left: 0;
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+
+  /* When affixed, space properly */
+  .azure-nav-list {
+    top: 0;
+    width: 218px;
+    margin-top: 30px;
+    margin-right: 0;
+  }
+}
+
+/* Tablet to desktop
+------------------------- */
+@media (min-width: 768px) and (max-width: 979px) {
+  /* Remove any padding from the body */
+  body {
+    padding-top: 0;
+  }
+  /* Adjust sidenav width */
+  .azure-nav-list {
+    width: 166px;
+    margin-top: 20px;
+  }
+  .azure-nav-list.affix {
+    top: 0;
+  }
+}
+
+/* Tablet
+------------------------- */
+@media (max-width: 767px) {
+  /* Remove any padding from the body */
+  body {
+    padding-top: 0;
+  }
+
+  /* Sidenav */
+  .azure-nav-list {
+    width: auto;
+    margin-bottom: 20px;
+  }
+  .azure-nav-list.affix {
+    position: static;
+    width: auto;
+    top: 0;
+  }
+
+  /* Unfloat the back to top link in footer */
+  .footer {
+    margin-left: -20px;
+    margin-right: -20px;
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+  .footer p {
+    margin-bottom: 9px;
+  }
+}
+
+/* Landscape phones
+------------------------- */
+@media (max-width: 480px) {
+  /* Remove padding above jumbotron */
+  body {
+    padding-top: 0;
+  }
+
+  /* Change up some type stuff */
+  h2 small {
+    display: block;
+  }
+
+  /* center align subhead text like the masthead */
+  .subhead h1,
+  .subhead p {
+    text-align: center;
+  }
+
+  /* Do our best to make tables work in narrow viewports */
+  table code {
+    white-space: normal;
+    word-wrap: break-word;
+    word-break: break-all;
+  }
+
+  /* Tighten up footer */
+  .footer {
+    padding-top: 20px;
+    padding-bottom: 20px;
+  }
+}
diff --git a/guidelines.html b/guidelines.html
index 35c161c..321f131 100644
--- a/guidelines.html
+++ b/guidelines.html
@@ -66,8 +66,8 @@
     <div class="container">
         <div class="row">
             <div class="span3">
-                <div class="sidebar-nav" style="padding: 20px 0;">
-                    <ul class="nav azure-nav-list nav-list affix" style="min-width: 210px; max-width: 290px">
+                <div class="sidebar-nav">
+                    <ul class="nav azure-nav-list nav-list affix">
                         <li class="active"><a href="#waystocontribute"><i class="icon-chevron-right"></i>Ways to contribute</a></li>
                         <li class="nav-header">Community member</li>
                         <li><a href="#source"><i class="icon-chevron-right"></i>Source code</a></li>
@@ -87,9 +87,10 @@
                 </div>
             </div>
             <div class="span9">
-                <section id="waystocontribute">
-                <h1>Let's work together.</h1>
+                
+                <h1 style="margin-bottom:  -20px">Let's work together.</h1>
 
+                <section id="waystocontribute">
                 <h2>Ways to contribute</h2>
 
                 <p>
@@ -178,7 +179,7 @@ <h2>Q&amp;A forums</h2>
                     </thead>
                     <tbody>
                         <tr>
-                            <td><a href="//stackoverflow.com/tagged/azure"><img 
+                            <td style="min-width: 83px"><a href="//stackoverflow.com/tagged/azure"><img 
                                 src="azure/stackoverflow.png" alt="StackOverflow" title="StackOverflow" style="width: 83px;height: 82px" /></a></td>
                             <td><a href="//stackoverflow.com/tagged/azure"><h2>StackOverflow</h2></a></td>
                             <td><a href="//stackoverflow.com/tagged/azure">azure</a></td>
@@ -267,19 +268,8 @@ <h2>Feature requests</h2>
                 </ul>
                 </section>
 
-
-
-
-
-
                 <hr />
 
-
-
-
-
-
-                <section id="contributing">
                 <div class="alert alert-info">
                     <!-- <a class="close">&times;</a> -->
                     <strong>Note:</strong> A Contribution Legal Agreement (CLA) is 
@@ -287,6 +277,7 @@ <h2>Feature requests</h2>
                     pull requests. Please read this entire page carefully.
                 </div>
 
+                <section id="contributing">
                 <h2>Contributing code</h2>
 
                 <p>
@@ -625,8 +616,6 @@ <h2>Jobs</h2>
 
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
     <script src="js/bootstrap.min.js"></script>
-    <!-- 
     <script src="js/azure.js"></script>
-    -->
 </body>
 </html>
\ No newline at end of file
diff --git a/js/azure.js b/js/azure.js
index ddb2327..4c9e9bc 100644
--- a/js/azure.js
+++ b/js/azure.js
@@ -4,16 +4,11 @@
 
     var $window = $(window)
 
-    // side bar
-    setTimeout(function () {
-      $('.azure-nav-list').affix({
-        offset: {
-          top: function () { return $window.width() <= 980 ? 290 : 210 }
-        , bottom: 270
-        }
-      })
-    }, 100)
+    // Disable certain links in docs
+    $('section [href^=#]').click(function (e) {
+      e.preventDefault()
+    })
 
   })
 
-}(window.jQuery)
\ No newline at end of file
+}(window.jQuery)