diff --git a/assets/css/devportal.css b/assets/css/devportal.css
index f2b0799dda..1cf2acee8d 100644
--- a/assets/css/devportal.css
+++ b/assets/css/devportal.css
@@ -530,6 +530,7 @@ th {
 #sidenav_accordion .panel {
   padding: 0;
   border-radius: 0;
+  border-bottom: 1px solid #cccccc;
 }
 
 #sidenav_accordion .panel-heading h5 {
@@ -678,7 +679,7 @@ th {
 }
 
 /* Responsive design for different viewscreens -------------------------------*/
-@media (min-width: 1200px) {
+@media (min-width: 1201px) {
   #page-toc-wrapper {
     float: right;
     margin-left: 15px;
diff --git a/assets/css/test-net.css b/assets/css/test-net.css
index c6934fc4d7..dd3ad2ee21 100644
--- a/assets/css/test-net.css
+++ b/assets/css/test-net.css
@@ -30,13 +30,41 @@
   height: auto;
 }
 
-.test-net-servers {
+#test-net-servers {
 	font-size: 15px;
 	border-radius: 5px;
   border: 1px solid #27a2db;
-  padding: 20px 20px 10px 20px;
+  width: 350px;
+  float: right;
+  margin-left: 15px;
 }
 
+#test-net-servers pre {
+  overflow-x: auto;
+}
+
+.page-test-net .container {
+  margin-left: 15px;
+  margin-right: 15px;
+  width: auto;
+}
+@media (min-width: 1600px) {
+  .page-test-net .container {
+    margin-left: auto;
+    margin-right: auto;
+    width: 1500px;
+  }
+}
+
+@media (max-width: 992px) {
+  #test-net-servers {
+    position: static;
+    float: none;
+    max-width: none;
+    width: auto;
+    margin: 0 0 30px 0;
+  }
+}
 
 h2 {
 	font-size: 36px;
@@ -45,7 +73,7 @@ h2 {
   margin-top: 0;
 }
 
-.test-net-servers h5 {
+#test-net-servers h5 {
 	letter-spacing: .04em;
   font-family: 'open_sansbold', sans-serif;
   text-transform: uppercase;
@@ -54,7 +82,7 @@ h2 {
   margin-top: 20px !important;
 }
 
-.test-net-servers .panel-heading {
+#test-net-servers .panel-heading {
   margin-top: 0;
   padding: 0;
   font-size: 21px;
diff --git a/tool/template-base.html b/tool/template-base.html
index d0b9dfd099..686c2f17dc 100644
--- a/tool/template-base.html
+++ b/tool/template-base.html
@@ -77,7 +77,7 @@
           {% if not have_edit_link %}
             {% set githuburl = target.github_forkurl %}
           {% endif %}
-          <a href="{{githuburl}}" class="github-edit">Edit on GitHub</a>
+          <a href="{{githuburl}}" target="_blank" class="github-edit">Edit on GitHub</a>
         </div><!-- /.github-edit -->
       </div><!-- /.nav -->
 
diff --git a/tool/template-index.html b/tool/template-index.html
index 8da5154461..d72a66dca9 100644
--- a/tool/template-index.html
+++ b/tool/template-index.html
@@ -31,9 +31,9 @@
         {% endfor %}
         <ul>
           <li class="top"><h5><span class="dev_heading">Ripple Resources</span></h5></li>
-          <li><a href="https://ripple.com/">Official Website</a></li>
           <li><a href="https://ripple.com/category/dev-blog/">Dev Blog</a></li>
-          <li><a href="https://github.com/ripple/">GitHub Organization</a></li>
+          <li><a href="https://github.com/ripple/">Source Code on GitHub</a></li>
+          <li><a href="https://ripple.com/">Corporate Website</a></li>
         </ul>
       </div>
     </div>
diff --git a/tool/template-sidebar_nav.html b/tool/template-sidebar_nav.html
index 15166a8472..8bfc1abcce 100644
--- a/tool/template-sidebar_nav.html
+++ b/tool/template-sidebar_nav.html
@@ -42,9 +42,9 @@
       <div id="sidenav_collapse_ripple_resources" class="collapse" role="tabpanel" aria-labelledby="sidenav_cat_head_ripple_resources">
         <div class="panel-body">
           <ul class="sidebar_cat_pagelist">
-            <li><a href="https://ripple.com/">Official Website</a></li>
             <li><a href="https://ripple.com/category/dev-blog/">Dev Blog</a></li>
-            <li><a href="https://github.com/ripple/">GitHub Organization</a></li>
+            <li><a href="https://github.com/ripple/">Open Source on GitHub</a></li>
+            <li><a href="https://ripple.com/">Corporate Website</a></li>
           </ul>
         </div><!-- /.panel-body -->
       </div><!-- /#sidenav_collapseripple_resources -->
diff --git a/tool/template-test-net.html b/tool/template-test-net.html
index eb2e50c7fc..bf922f915b 100644
--- a/tool/template-test-net.html
+++ b/tool/template-test-net.html
@@ -1,15 +1,26 @@
 {% extends "template-base.html" %}
 
+{% block bodyclasses %}sidebar-primary page-test-net{% endblock %}
+
 {% block main %}
-<div id="container" class="lit">
-  <h1>XRP Test Net Faucet</h1>
 
+<h1>XRP Test Net Faucet</h1>
+
+<aside id="test-net-servers" class="panel panel-default">
+  <div class="panel-body">
+    <p class="in-this-doc panel-heading">Test Net Servers</p>
+    <p>Use the following addresses to connect to the XRP Test Net and send transactions from your account.</p>
+    <h5>Websockets and Ripple API</h4>
+    <pre><code>wss://s.altnet.rippletest.net:51233</code></pre>
+    <h5>JSON-RPC</h4>
+    <pre><code>https://s.altnet.rippletest.net:51234</code></pre>
+  </div>
+</aside>
+
+<div class="content">
   <p>Ripple has created this alternative XRP Ledger test network with nodes in every region of the world to provide a testing platform for any software products built on the XRP Ledger without using real funds.</p>
-
   <p>Test Net funds are intended for <strong>testing</strong> only. The Test Net ledger and balances will be reset on a regular basis.</p>
-
   <button class="cta_readmore btn">Generate credentials</button>
-
   <div id='your-credentials'></div>
   <div id='loader' style="display: none;"><img class='throbber' src="assets/img/rippleThrobber.png"> Generating Keys...</div>
   <div id='address'></div>
@@ -17,17 +28,6 @@
   <div id='balance'></div>
 </div>
 
-<aside id="page-toc-wrapper" class="test-net-servers panel panel-default">
-  <div class="panel-body">
-    <p class="in-this-doc panel-heading">Test Net Servers</p>
-    <p>Use the following addresses to connect to the XRP Test Net and send transactions from your account.</p>
-    <h5>Websockets and Ripple API</h4>
-    <p>wss://s.altnet.rippletest.net:51233</p>
-    <h5>JSON-RPC</h4>
-    <p>https://s.altnet.rippletest.net:51234</p>
-  </div>
-</div>
-
 {% endblock %}
 
 {% block sidebar %}