diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index bbd2f71..18b6327 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -128,5 +128,5 @@
        data-sortOrder="random"
        data-cardSizes="6x6"
        data-initial-results="6"
-       data-maxResults="12"></div>
+       data-maxResults="24"></div>
 </div></section>
diff --git a/docs/html/images/cards/course-nanodegree_2x.png b/docs/html/images/cards/course-nanodegree_2x.png
deleted file mode 100644
index 8f99703..0000000
--- a/docs/html/images/cards/course-nanodegree_2x.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/cards/course-ud825_2x.png b/docs/html/images/cards/course-ud825_2x.png
deleted file mode 100644
index 77f98b5..0000000
--- a/docs/html/images/cards/course-ud825_2x.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/cards/course-ud875_2x.jpg b/docs/html/images/cards/course-ud875_2x.jpg
deleted file mode 100644
index b7fc8cc..0000000
--- a/docs/html/images/cards/course-ud875_2x.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/cards/course-ud876_2x.jpg b/docs/html/images/cards/course-ud876_2x.jpg
deleted file mode 100644
index 5f27246..0000000
--- a/docs/html/images/cards/course-ud876_2x.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/cards/courses/admob_course.png b/docs/html/images/cards/courses/admob_course.png
new file mode 100644
index 0000000..a068a73
--- /dev/null
+++ b/docs/html/images/cards/courses/admob_course.png
Binary files differ
diff --git a/docs/html/images/cards/course-ud855_2x.jpg b/docs/html/images/cards/courses/advanced_android_course.jpg
similarity index 100%
rename from docs/html/images/cards/course-ud855_2x.jpg
rename to docs/html/images/cards/courses/advanced_android_course.jpg
Binary files differ
diff --git a/docs/html/images/cards/courses/android_analytics_course.png b/docs/html/images/cards/courses/android_analytics_course.png
new file mode 100644
index 0000000..1ce1d01
--- /dev/null
+++ b/docs/html/images/cards/courses/android_analytics_course.png
Binary files differ
diff --git a/docs/html/images/cards/courses/android_auto_course.jpg b/docs/html/images/cards/courses/android_auto_course.jpg
new file mode 100644
index 0000000..84cc1f3
--- /dev/null
+++ b/docs/html/images/cards/courses/android_auto_course.jpg
Binary files differ
diff --git a/docs/html/images/cards/course-ud862_2x.jpg b/docs/html/images/cards/courses/android_design_course.jpg
similarity index 100%
rename from docs/html/images/cards/course-ud862_2x.jpg
rename to docs/html/images/cards/courses/android_design_course.jpg
Binary files differ
diff --git a/docs/html/images/cards/course-ud853_2x.jpg b/docs/html/images/cards/courses/android_fundamentals_course.jpg
similarity index 100%
rename from docs/html/images/cards/course-ud853_2x.jpg
rename to docs/html/images/cards/courses/android_fundamentals_course.jpg
Binary files differ
diff --git a/docs/html/images/cards/courses/android_identity_course.png b/docs/html/images/cards/courses/android_identity_course.png
new file mode 100644
index 0000000..e4a47c3
--- /dev/null
+++ b/docs/html/images/cards/courses/android_identity_course.png
Binary files differ
diff --git a/docs/html/images/cards/courses/android_location_course.png b/docs/html/images/cards/courses/android_location_course.png
new file mode 100644
index 0000000..21a2aaa
--- /dev/null
+++ b/docs/html/images/cards/courses/android_location_course.png
Binary files differ
diff --git a/docs/html/images/cards/courses/android_maps_course.png b/docs/html/images/cards/courses/android_maps_course.png
new file mode 100644
index 0000000..70910e9
--- /dev/null
+++ b/docs/html/images/cards/courses/android_maps_course.png
Binary files differ
diff --git a/docs/html/images/cards/courses/android_nanodegree.png b/docs/html/images/cards/courses/android_nanodegree.png
new file mode 100644
index 0000000..fb50494
--- /dev/null
+++ b/docs/html/images/cards/courses/android_nanodegree.png
Binary files differ
diff --git a/docs/html/images/cards/courses/android_performance_course.jpg b/docs/html/images/cards/courses/android_performance_course.jpg
new file mode 100644
index 0000000..a255718
--- /dev/null
+++ b/docs/html/images/cards/courses/android_performance_course.jpg
Binary files differ
diff --git a/docs/html/images/cards/courses/android_tv_cast_course.jpg b/docs/html/images/cards/courses/android_tv_cast_course.jpg
new file mode 100644
index 0000000..4b86310
--- /dev/null
+++ b/docs/html/images/cards/courses/android_tv_cast_course.jpg
Binary files differ
diff --git a/docs/html/images/cards/courses/android_wear_course.jpg b/docs/html/images/cards/courses/android_wear_course.jpg
new file mode 100644
index 0000000..763e647
--- /dev/null
+++ b/docs/html/images/cards/courses/android_wear_course.jpg
Binary files differ
diff --git a/docs/html/images/cards/course-ud837_2x.jpg b/docs/html/images/cards/courses/beginning_android_course.jpg
similarity index 100%
rename from docs/html/images/cards/course-ud837_2x.jpg
rename to docs/html/images/cards/courses/beginning_android_course.jpg
Binary files differ
diff --git a/docs/html/images/cards/course-ud867_2x.jpg b/docs/html/images/cards/courses/gradle_course.jpg
similarity index 100%
rename from docs/html/images/cards/course-ud867_2x.jpg
rename to docs/html/images/cards/courses/gradle_course.jpg
Binary files differ
diff --git a/docs/html/images/cards/course-ud849_2x.jpg b/docs/html/images/cards/courses/mobile_ux_course.jpg
similarity index 100%
rename from docs/html/images/cards/course-ud849_2x.jpg
rename to docs/html/images/cards/courses/mobile_ux_course.jpg
Binary files differ
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index 3ae61e7..c481277 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -158,16 +158,22 @@
   "develop/landing/courses": {
     "title": "",
     "resources": [
-      "https://www.udacity.com/course/ux-design-for-mobile-developers--ud849",
-      "https://www.udacity.com/course/developing-android-apps--ud853",
-      "https://www.udacity.com/course/android-performance--ud825",
+      "https://www.udacity.com/course/ud849",
+      "https://www.udacity.com/course/ud853",
+      "https://www.udacity.com/course/ud825",
       "https://www.udacity.com/android",
-      "https://www.udacity.com/course/advanced-android-app-development--ud855",
-      "https://www.udacity.com/course/android-ubiquitous-computing--ud875",
-      "https://www.udacity.com/course/google-play-services--ud876",
-      "https://www.udacity.com/course/android-design-for-developers--ud862",
-      "https://www.udacity.com/course/android-development-for-beginners--ud837",
-      "https://www.udacity.com/course/gradle-for-android-and-java--ud867"
+      "https://www.udacity.com/course/ud855",
+      "https://www.udacity.com/course/ud875A",
+      "https://www.udacity.com/course/ud875B",
+      "https://www.udacity.com/course/ud875C",
+      "https://www.udacity.com/course/ud876--1",
+      "https://www.udacity.com/course/ud876--2",
+      "https://www.udacity.com/course/ud876--3",
+      "https://www.udacity.com/course/ud876--4",
+      "https://www.udacity.com/course/ud876--5",
+      "https://www.udacity.com/course/ud862",
+      "https://www.udacity.com/course/ud837",
+      "https://www.udacity.com/course/ud867"
     ]
   },
   "preview/landing/more": {
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index ce16675d..d63ccbd 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -2650,6 +2650,200 @@
     "titleFriendly": ""
   },
 
+ // Online courses
+
+ {
+    "title":"UX Design for Mobile Developers",
+    "titleFriendly":"",
+    "summary":"Learn how to design a 5-star app.",
+    "url":"https://www.udacity.com/course/ud849",
+    "group":"",
+    "keywords": ["mobile","ux","design"],
+    "tags": ["courses, start"],
+    "image":"images/cards/courses/mobile_ux_course.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Developing Android Apps",
+    "titleFriendly":"",
+    "summary":"Learn Android and build an app!",
+    "url":"https://www.udacity.com/course/ud853",
+    "group":"",
+    "keywords": ["android", "start","firstapp","sdk"],
+    "tags": ["courses, start"],
+    "image":"images/cards/courses/android_fundamentals_course.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Android Performance",
+    "titleFriendly":"",
+    "summary":"Optimize your apps for speed and usability.",
+    "url":"https://www.udacity.com/course/ud825",
+    "group":"",
+    "keywords": ["android, performance","battery"],
+    "tags": ["courses, performance"],
+    "image":"images/cards/courses/android_performance_course.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Enroll in the Android Nanodegree",
+    "titleFriendly":"",
+    "summary":"Enroll in the Android Nanodegree to build the skills to work as an Android developer.",
+    "url":"https://www.udacity.com/android",
+    "group":"",
+    "keywords": ["android, nanodegree"],
+    "tags": ["courses"],
+    "image":"images/cards/courses/android_nanodegree.png",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Advanced Android App Development",
+    "titleFriendly":"",
+    "summary":"Productionize and publish your apps.",
+    "url":"https://www.udacity.com/course/ud855",
+    "group":"",
+    "keywords": ["android, experts"],
+    "tags": ["courses, expert"],
+    "image":"images/cards/courses/advanced_android_course.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Material Design for Android Developers",
+    "titleFriendly":"",
+    "summary":"Learn how to make your apps material.",
+    "url":"https://www.udacity.com/course/ud862",
+    "group":"",
+    "keywords": ["android, design, pure, material"],
+    "tags": ["courses, start, material"],
+    "image":"images/cards/courses/android_design_course.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Android for Beginners",
+    "titleFriendly":"",
+    "summary":"Make your first Android app, even if you don't write code.",
+    "url":"https://www.udacity.com/course/ud837",
+    "group":"",
+    "keywords": ["android, sdk, firstapp"],
+    "tags": ["courses, start"],
+    "image":"images/cards/courses/beginning_android_course.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Gradle for Android and Java",
+    "titleFriendly":"",
+    "summary":"Build better apps through automation",
+    "url":"https://www.udacity.com/course/ud867",
+    "group":"",
+    "keywords": ["gradle","studio", "sdk"],
+    "tags": ["courses, gradle, sdk"],
+    "image":"images/cards/courses/gradle_course.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Add Location and Context to your app",
+    "titleFriendly":"",
+    "summary":"Make Your Android App Location Aware.",
+    "url":"https://www.udacity.com/course/ud876--1",
+    "group":"",
+    "keywords": ["google services, context, location"],
+    "tags": ["courses, google, location, context"],
+    "image":"images/cards/courses/android_location_course.png",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Analytics and Tag Manager for Android",
+    "titleFriendly":"",
+    "summary":"Use Analytics and Tag Manager in Your Apps.",
+    "url":"https://www.udacity.com/course/ud876--2",
+    "group":"",
+    "keywords": ["google services, analytics, tag manager"],
+    "tags": ["courses, google, analytics"],
+    "image":"images/cards/courses/android_analytics_course.png",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"AdMob for Android",
+    "titleFriendly":"",
+    "summary":"Monetize Your App by Displaying Ads.",
+    "url":"https://www.udacity.com/course/ud876--3",
+    "group":"",
+    "keywords": ["monetize, google services, ads, admob"],
+    "tags": ["courses, google, ads, admob"],
+    "image":"images/cards/courses/admob_course.png",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Add Maps to your Android app",
+    "titleFriendly":"",
+    "summary":"Use maps, cameras, markers and more in your app.",
+    "url":"https://www.udacity.com/course/ud876--4",
+    "group":"",
+    "keywords": ["google, maps, marker, camera"],
+    "tags": ["courses, google, maps"],
+    "image":"images/cards/courses/android_maps_course.png",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Add Sign-in to your Android app",
+    "titleFriendly":"",
+    "summary":"Build a Seamless Sign-In Experience.",
+    "url":"https://www.udacity.com/course/ud876--5",
+    "group":"",
+    "keywords": ["google services, signin, authorization"],
+    "tags": ["courses, google, auth"],
+    "image":"images/cards/courses/android_identity_course.png",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Android Wear Development",
+    "titleFriendly":"",
+    "summary":"Extend your Apps to Android Smartwatches.",
+    "url":"https://www.udacity.com/course/ud875A",
+    "group":"",
+    "keywords": ["wear, wearables, smartwatch"],
+    "tags": ["courses, wear, wearable"],
+    "image":"images/cards/courses/android_wear_course.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Android TV and Google Cast Development",
+    "titleFriendly":"",
+    "summary":"Extend your Apps to the Big Screen.",
+    "url":"https://www.udacity.com/course/ud875B",
+    "group":"",
+    "keywords": ["cast, living room"],
+    "tags": ["courses, cast, tv"],
+    "image":"images/cards/courses/android_tv_cast_course.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
+  {
+    "title":"Android Auto Development",
+    "titleFriendly":"",
+    "summary":"Put your apps in the driver's seat.",
+    "url":"https://www.udacity.com/course/ud875C",
+    "group":"",
+    "keywords": ["auto"],
+    "tags": ["courses, auto"],
+    "image":"images/cards/courses/android_auto_course.jpg",
+    "lang":"en",
+    "type":"online course"
+  },
 
 
  // TODO remove this?
@@ -2666,126 +2860,6 @@
     "type":"design"
   },
   {
-    "title":"UX Design for Mobile Developers",
-    "titleFriendly":"",
-    "summary":"Learn how to design a 5-star app.",
-    "url":"https://www.udacity.com/course/ux-design-for-mobile-developers--ud849",
-    "group":"",
-    "keywords": ["mobile","ux","design"],
-    "tags": ["courses"],
-    "image":"images/cards/course-ud849_2x.jpg",
-    "lang":"en",
-    "type":"online course"
-  },
-  {
-    "title":"Developing Android Apps",
-    "titleFriendly":"",
-    "summary":"Learn Android and build an app!",
-    "url":"https://www.udacity.com/course/developing-android-apps--ud853",
-    "group":"",
-    "keywords": ["start","firstapp","sdk"],
-    "tags": ["courses"],
-    "image":"images/cards/course-ud853_2x.jpg",
-    "lang":"en",
-    "type":"online course"
-  },
-  {
-    "title":"Android Performance",
-    "titleFriendly":"",
-    "summary":"Optimize your apps for speed and usability.",
-    "url":"https://www.udacity.com/course/android-performance--ud825",
-    "group":"",
-    "keywords": ["performance","battery"],
-    "tags": ["courses"],
-    "image":"images/cards/course-ud825_2x.png",
-    "lang":"en",
-    "type":"online course"
-  },
-  {
-    "title":"Enroll in the Android Nanodegree",
-    "titleFriendly":"",
-    "summary":"Enroll in the Android Nanodegree to build the skills to work as an Android developer.",
-    "url":"https://www.udacity.com/android",
-    "group":"",
-    "keywords": ["nanodegree"],
-    "tags": ["courses"],
-    "image":"images/cards/course-nanodegree_2x.png",
-    "lang":"en",
-    "type":"online course"
-  },
-  {
-    "title":"Advanced Android App Development",
-    "titleFriendly":"",
-    "summary":"Productionize and publish your apps.",
-    "url":"https://www.udacity.com/course/advanced-android-app-development--ud855",
-    "group":"",
-    "keywords": ["android, experts"],
-    "tags": ["courses"],
-    "image":"images/cards/course-ud855_2x.jpg",
-    "lang":"en",
-    "type":"online course"
-  },
-  {
-    "title":"Android Ubiquitous Computing",
-    "titleFriendly":"",
-    "summary":"Extend your apps to Wear, TV, and Auto.",
-    "url":"https://www.udacity.com/course/android-ubiquitous-computing--ud875",
-    "group":"",
-    "keywords": ["wear, tv, auto"],
-    "tags": ["courses"],
-    "image":"images/cards/course-ud875_2x.jpg",
-    "lang":"en",
-    "type":"online course"
-  },
-  {
-    "title":"Google Play Services",
-    "titleFriendly":"",
-    "summary":"Use Google APIs to improve your apps.",
-    "url":"https://www.udacity.com/course/google-play-services--ud876",
-    "group":"",
-    "keywords": ["google, play services, google services"],
-    "tags": ["courses"],
-    "image":"images/cards/course-ud876_2x.jpg",
-    "lang":"en",
-    "type":"online course"
-  },
-  {
-    "title":"Android Design for Developers",
-    "titleFriendly":"",
-    "summary":"Learn how to make your apps material.",
-    "url":"https://www.udacity.com/course/android-design-for-developers--ud862",
-    "group":"",
-    "keywords": ["design, pure, material"],
-    "tags": ["courses"],
-    "image":"images/cards/course-ud862_2x.jpg",
-    "lang":"en",
-    "type":"online course"
-  },
-  {
-    "title":"Android Development for Beginners",
-    "titleFriendly":"",
-    "summary":"Make your first Android app, even if you don't write code.",
-    "url":"https://www.udacity.com/course/android-development-for-beginners--ud837",
-    "group":"",
-    "keywords": ["firstapp",],
-    "tags": ["courses"],
-    "image":"images/cards/course-ud837_2x.jpg",
-    "lang":"en",
-    "type":"online course"
-  },
-  {
-    "title":"Gradle for Android and Java",
-    "titleFriendly":"",
-    "summary":"Build better apps through automation",
-    "url":"https://www.udacity.com/course/gradle-for-android-and-java--ud867",
-    "group":"",
-    "keywords": ["gradle","studio", "sdk"],
-    "tags": ["courses"],
-    "image":"images/cards/course-ud867_2x.jpg",
-    "lang":"en",
-    "type":"online course"
-  },
-  {
     "title":"Watch Faces for Android Wear",
     "titleFriendly":"",
     "summary":"Watch faces let you customize the most prominent UI feature of Android wearables. The API is simple enough for rapid development and flexible enough to build something awesome.",
diff --git a/docs/html/training/index.jd b/docs/html/training/index.jd
index 1b0b1fe..16658b9 100644
--- a/docs/html/training/index.jd
+++ b/docs/html/training/index.jd
@@ -37,6 +37,6 @@
        data-query="collection:develop/landing/courses"
        data-sortOrder="random"
        data-cardSizes="6x6"
-       data-maxResults="12"
-       data-initial-results="3"></div>
+       data-maxResults="24"
+       data-initial-results="6"></div>
 </div>
\ No newline at end of file