diff --git a/public/download/_data.json b/public/download/_data.json
index 4e32379336..26962aa24d 100644
--- a/public/download/_data.json
+++ b/public/download/_data.json
@@ -4,44 +4,52 @@
     "subtitle": "Choose from our list of frameworks",
 
     "downloads": {
-      "Angular_2": {
-        "description": "Angular 2 is currently in Developer Preview for JavaScript and Dart.",
-        "2.0.0-alpha for JavaScript": {
-          "npm": "https://www.npmjs.com/package/angular2"
-        },
-        "2.0.0-alpha for Dart": {
-          "pub": "https://pub.dartlang.org/packages/angular2#installing"
-        }
+      "Angular_2_JS": {
+        "name": "Angular 2 (JavaScript)",
+        "language": "JavaScript",
+        "version": "2.0.0-alpha",
+        "url": "https://www.npmjs.com/package/angular2",
+        "description": "Angular 2 is currently in Developer Preview for JavaScript and Dart."
       },
 
-      "Angular_1": {
-        "description": "The production ready version of Angular for JavaScript",
-
-        "1": {
-          "file": "https://code.angularjs.org/"
-        }
+      "Angular_2_DART": {
+        "name": "Angular 2 (Dart)",
+        "language": "Dart",
+        "version": "2.0.0-alpha",
+        "url": "https://pub.dartlang.org/packages/angular2#installing",
+        "description": "Angular 2 is currently in Developer Preview for JavaScript and Dart."
       },
 
-      "AngularDart_1": {
-        "description": "The production ready version of Angular for Dart",
+      "Angular_1_JS": {
+        "name": "Angular 1 (JavaScript)",
+        "language": "Javascript",
+        "version": "1",
+        "url": "https://code.angularjs.org/",
+        "description": "The production ready version of Angular for JavaScript"
+      },
 
-        "1": {
-          "file": "https://angulardart.org/"
-        }
+      "Angular_1_DART": {
+        "name": "Angular 1 (Dart)",
+        "language": "Dart",
+        "version": "1",
+        "url": "https://angulardart.org/",
+        "description": "The production ready version of Angular for Dart"
       },
 
       "AngularFire_1": {
-        "description": "AngularFire is the officially supported Angular binding for Firebase.",
-        "1": {
-          "file": "https://www.firebase.com/docs/web/libraries/angular/index.html"
-        }
+        "name": "AngularFire",
+        "language": "Javascript",
+        "version": "1",
+        "url": "https://www.firebase.com/docs/web/libraries/angular/index.html",
+        "description": "AngularFire is the officially supported Angular binding for Firebase."
       },
 
       "AngularMaterial_1": {
-        "description": "The Angular Material project is an implementation of Material Design in Angular 1 for JS.",
-        "1": {
-          "file": "https://material.angularjs.org/#/getting-started"
-        }
+        "name": "Angular Material",
+        "language": "Javascript",
+        "version": "1",
+        "url":  "https://material.angularjs.org/#/getting-started",
+        "description": "The Angular Material project is an implementation of Material Design in Angular 1 for JS."
       }
     }
   }
diff --git a/public/download/index.jade b/public/download/index.jade
index bb867449fa..04ff87a344 100644
--- a/public/download/index.jade
+++ b/public/download/index.jade
@@ -1,25 +1,4 @@
 .grid-fluid.l-space-bottom-8
-  for versions, framework in downloads
-    div.c9.l-space-bottom-4
-      frameworkName = framework.replace(/\_/gm, ' ')
-      header
-        h2.text-headline #{frameworkName}
-
-
-      for version, name in versions
-        if name == "description"
-          p #{version}
-
-        else
-            ul.l-pad-left-0
-              if version.file
-                li
-                  != partial("../_includes/_hover-card", {name: "Version " + name, url: version.file })
-
-              if version.npm
-                li
-                  != partial("../_includes/_hover-card", {name: "Version " + name, url: version.npm })
-
-              if version.pub
-                li
-                  != partial("../_includes/_hover-card", {name: "Version " + name, url: version.pub })
+  for slug, framework in downloads
+    div.c9.l-space-bottom-2
+        != partial("../_includes/_hover-card", {name: slug.name , url: slug.url })