diff --git a/website/source/downloads_tools.html.erb b/website/source/downloads_tools.html.erb
index fee810b8a..4d8e60684 100644
--- a/website/source/downloads_tools.html.erb
+++ b/website/source/downloads_tools.html.erb
@@ -21,15 +21,15 @@ description: |-
   <li>
     <a href="https://github.com/hashicorp/envconsul">Envconsul</a> - Read and set environmental variables for processes from Consul.
   </li>
+  <li>
+    <a href="https://github.com/hashicorp/consul-migrate">Consul Migrate</a> - Data migration tool to handle Consul upgrades to 0.5.1+
+  </li>
   <li>
     <a href="https://github.com/hashicorp/consul-replicate">Consul Replicate</a> - Consul cross-DC KV replication daemon.
   </li>
   <li>
     <a href="https://github.com/hashicorp/consul-template">Consul Template</a> - Generic template rendering and notifications with Consul
   </li>
-  <li>
-    <a href="https://github.com/hashicorp/consul-migrate">Consul Migrate</a> - Data migration tool to handle Consul upgrades to 0.5.1+
-  </li>
 </ul>
 
 <h2>Community Tools</h2>
@@ -37,9 +37,6 @@ description: |-
   These Consul tools are created and managed by the amazing members of the Consul community:
 </p>
 <ul>
-  <li>
-    <a href="https://github.com/jippi/hashi-ui">hashi-ui</a> - A modern user interface for the Consul and Nomad
-  </li>
   <li>
     <a href="http://www.cfg4j.org">cfg4j</a> - Configuration library for Java distributed apps. Reads and auto-updates configuration from Consul KVs (and others)
   </li>
@@ -67,11 +64,14 @@ description: |-
   <li>
     <a href="http://xordataexchange.github.io/crypt/">crypt</a> - Store and retrieve encrypted configuration parameters from etcd or Consul
   </li>
+  <li>
+    <a href="https://github.com/gliderlabs/docker-consul">docker-consul</a> - Dockerized Consul Agent
+  </li>
   <li>
     <a href="https://github.com/smoketurner/dropwizard-consul">Dropwizard Consul Bundle</a> - Service discovery and configuration integration with the <a href="http://www.dropwizard.io/">Dropwizard</a> framework
   </li>
   <li>
-    <a href="https://github.com/gliderlabs/docker-consul">docker-consul</a> - Dockerized Consul Agent
+    <a href="https://github.com/pszymczyk/embedded-consul">Embedded Consul</a> - Library for JVM based applications, provides easy way to run Consul in integration tests
   </li>
   <li>
     <a href="https://github.com/eBay/fabio">fabio</a> - Fast, zero-conf, consul-aware load-balancing HTTP/HTTPS router
@@ -82,14 +82,14 @@ description: |-
   <li>
     <a href="https://github.com/amirkibbar/red-apple">gradle-consul-plugin</a> - A Consul Gradle plugin
   </li>
+  <li>
+    <a href="https://github.com/jippi/hashi-ui">hashi-ui</a> - A modern user interface for the Consul and Nomad
+  </li>
   <li>
     <a href="https://github.com/SVT/helios-consul">helios-consul</a> - Service registrar plugin for Helios
   </li>
   <li>
-    <a href="https://github.com/gliderlabs/registrator">registrator</a> - Service registry bridge for Docker
-  </li>
-  <li>
-    <a href="https://github.com/spring-cloud/spring-cloud-consul">Spring Cloud Consul</a> - Service discovery, configuration and events for Spring Cloud
+    <a href="https://plugins.jenkins.io/consul">Jenkins Consul Plugin</a> - Jenkins plugin for service discovery and K/V store
   </li>
   <li>
     <a href="https://github.com/allegro/marathon-consul">marathon-consul</a> - Service registry bridge for Marathon
@@ -104,14 +104,14 @@ description: |-
     <a href="http://opennodecloud.com/products/nodefabric.html">NodeFabric</a> - Turnkey CentOS 7 Atomic Host image with integrated Consul, Registrator and HAProxy - enabling rapid MariaDB-Galera and Ceph deployments
   </li>
   <li>
-    <a href="https://github.com/pszymczyk/embedded-consul">Embedded Consul</a> - Library for JVM based applications, provides easy way to run Consul in integration tests
+    <a href="https://github.com/gliderlabs/registrator">registrator</a> - Service registry bridge for Docker
   </li>
   <li>
-    <a href="https://plugins.jenkins.io/consul">Jenkins Consul Plugin</a> - Jenkins plugin for service discovery and K/V store
+    <a href="https://github.com/spring-cloud/spring-cloud-consul">Spring Cloud Consul</a> - Service discovery, configuration and events for Spring Cloud
   </li>
 </ul>
 
 <p>
-  Are you the author of a tool and you would like to be featured on this page?  The Consul website is open source and is embedded inside the <a href="https://github.com/hashicorp/consul">Consul repository</a> on GitHub.  You can submit a Pull Request to add your tool to the list and we will gladly review it.
+  Are you the author of a tool and you would like to be featured on this page?  The Consul website is open source and is embedded inside the <a target="_blank" href="https://github.com/hashicorp/consul">Consul repository</a> on GitHub.  You can submit a Pull Request to add your tool to the list and we will gladly review it.
 </p>
 </section>