diff --git a/seed_data/coursewares.json b/seed_data/coursewares.json
index a24e83bc37..937751adc9 100644
--- a/seed_data/coursewares.json
+++ b/seed_data/coursewares.json
@@ -165,13 +165,13 @@
     "name": "Use the h2 Element",
     "difficulty": 0.010,
     "description": [
-      "Add an <code>h2</code> tag that says \"Cat Photo App\" to make a second HTML <code>element</code> below the \"Hello World\" <code>h1</code> element.",
+      "Add an <code>h2</code> tag that says \"CatPhotoApp\" to make a second HTML <code>element</code> below the \"Hello World\" <code>h1</code> element.",
       "The h2 element you enter will create an h2 element on the website.",
       "This element tells the browser how to render the text that it contains.",
       "<code>h2</code> elements are slightly smaller than <code>h1</code> elements. There are also <code>h3</code>, <code>h4</code>, <code>h5</code> and <code>h6</code> elements."
     ],
     "tests": [
-      "assert.isTrue((/cat(\\s)+photo(\\s)+app/gi).test($('h2').text()), 'Your h2 element should have the text \"Cat Photo App\"')",
+      "assert.isTrue((/cat(\\s)+photo(\\s)+app/gi).test($('h2').text()), 'Your h2 element should have the text \"CatPhotoApp\"')",
       "assert.isTrue((/hello(\\s)+world/gi).test($('h1').text()), 'Your h1 element should have the text \"Hello World\"')"
     ],
     "challengeSeed": [
@@ -193,7 +193,7 @@
     ],
     "challengeSeed": [
       "<h1>Hello World</h1>",
-      "<h2>Cat Photo App</h2>"
+      "<h2>CatPhotoApp</h2>"
     ],
     "challengeType": 0
   },
@@ -212,7 +212,7 @@
     ],
     "challengeSeed": [
       "<h1>Hello World</h1>",
-      "<h2>Cat Photo App</h2>",
+      "<h2>CatPhotoApp</h2>",
       "<p>Hello Paragraph</p>"
     ],
     "challengeType": 0
@@ -236,7 +236,7 @@
       "<!--",
       "<h1>Hello World</h1>",
       "",
-      "<h2>Cat Photo App</h2>",
+      "<h2>CatPhotoApp</h2>",
       "",
       "<br/>",
       "",
@@ -263,7 +263,7 @@
       "<!--",
       "<h1>Hello World</h1>",
       "",
-      "<h2>Cat Photo App</h2>",
+      "<h2>CatPhotoApp</h2>",
       "",
       "<br/>",
       "",
@@ -280,7 +280,7 @@
       "Change the text in the <code>p</code> element to use the first few words of <code>Kitty Ipsum</code> text.",
       "Web developers traditionally use <code>Lorem Ipsum</code> as placeholder text. It's called Lorem Ipsum text because those are the first two words of a famous passage by Cicero of Ancient Rome.",
       "Lorem Ipsum text has been used as placeholder text by typesetters since the 16th century, and this tradition continues on the web.",
-      "Well, 5 centuries is long enough. Since we're building a cat photo app, let's use something called <a href='http://kittyipsum.com/'>Kitty Ipsum</a>!",
+      "Well, 5 centuries is long enough. Since we're building a CatPhotoApp, let's use something called <a href='http://kittyipsum.com/'>Kitty Ipsum</a>!",
       "Here are the first few words of Kitty Ipsum text, which you can copy and paste into the right position: <code>Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.</code>"
     ],
     "tests": [
@@ -289,7 +289,7 @@
     "challengeSeed": [
       "<h1>Hello World</h1>",
       "",
-      "<h2>Cat Photo App</h2>",
+      "<h2>CatPhotoApp</h2>",
       "",
       "<br/>",
       "",
@@ -304,7 +304,7 @@
     "description": [
       "Delete the h1 and br elements so we can simplify our view.",
       "Our phone doesn't have much space, for HTML elements.",
-      "Let's remove the unnecessary elements so we can start building our cat photo app."
+      "Let's remove the unnecessary elements so we can start building our CatPhotoApp."
     ],
     "tests": [
       "assert(($('h1').length == 0), 'Delete the h1 element.')",
@@ -315,7 +315,7 @@
     "challengeSeed": [
       "<h1>Hello World</h1>",
       "",
-      "<h2>Cat Photo App</h2>",
+      "<h2>CatPhotoApp</h2>",
       "",
       "<br/>",
       "",
@@ -331,13 +331,13 @@
       "Change the <code>h2</code> element's style so that its text color is red.",
       "We can do this by changing the <code>style</code> of the <code>h2</code> element.",
       "The style responsible for the color of an element's text is the \"color\" style.",
-      "Here's how you would set the <code>h2</code> element's text color to blue: <code>&#60;h2 style=\"color: blue\"&#62;cat photo app&#60;h2&#62;</code>"
+      "Here's how you would set the <code>h2</code> element's text color to blue: <code>&#60;h2 style=\"color: blue\"&#62;CatPhotoApp&#60;h2&#62;</code>"
     ],
     "tests": [
       "assert($('h2').css('color') === 'rgb(255, 0, 0)', 'Your h2 element should be red.')"
     ],
     "challengeSeed": [
-      "<h2>Cat Photo App</h2>",
+      "<h2>CatPhotoApp</h2>",
       "",
       "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>"
     ],
@@ -350,7 +350,7 @@
     "description": [
       "Create remove your <code>h2</code> element's <code>style</code> tag and write the CSS to make all <code>h2</code> elements blue.",
       "With CSS, there are hundreds of <code>CSS attributes</code> that you can use to change the way an element looks on a web page.",
-      "When you entered <code>&#60;h2 style=\"color: red\"&#62;Cat Photo App&#60;h2&#62;</code>, you were giving that individual h2 element an <code>inline style</code>",
+      "When you entered <code>&#60;h2 style=\"color: red\"&#62;CatPhotoApp&#60;h2&#62;</code>, you were giving that individual h2 element an <code>inline style</code>",
       "That's one way to add style to an element, but a better way is by using <code>Cascading Style Sheets (CSS)</code>.",
       "At the top of your code, create a <code>style tag</code> like this: <code>&#60;style&#62;&#60;/style&#62;</code>",
       "Inside that style element, you can create a <code>css selector</code> for all <code>h2</code> elements. For example, if you wanted all <code>h2</code> elements to be red, your style element would look like this: <code>&#60;style&#62;h2 {color: red;}&#60;/style&#62;</code>",
@@ -361,7 +361,7 @@
       "assert(!$('h2').attr('style'), 'You should remove the style attribute from your h2 element.')"
     ],
     "challengeSeed": [
-      "<h2 style='color: red'>Cat Photo App</h2>",
+      "<h2 style='color: red'>CatPhotoApp</h2>",
       "",
       "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>"
     ],
@@ -377,7 +377,7 @@
       "Here's the anatomy of a CSS class:",
       "<img class='img-responsive' src='https://www.evernote.com/l/AHSCzZV0l_dDLrqD8r9JsHaBWfEzdN0OpRwB/image.png'/>",
       "Classes always start with a period. You can see that we've created a CSS class called <code>.blue-text</code> within the <code>&#60;style&#62;</code> tag.",
-      "You can apply a class to an element like this: <code>&#60;h2 class=\"blue-text\"&#62;Cat Photo App&#60;h2&#62;</code>",
+      "You can apply a class to an element like this: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;h2&#62;</code>",
       "Instead of creating a new Style tag, try removing the h2 style declaration from the existing style element, and replace it with the class declaration for \".red-text\"."
     ],
     "tests": [
@@ -391,7 +391,7 @@
       "  }",
       "</style>",
       "",
-      "<h2>Cat Photo App</h2>",
+      "<h2>CatPhotoApp</h2>",
       "",
       "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>"
     ],
@@ -418,7 +418,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>"
     ],
@@ -445,7 +445,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p class='red-text'>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>"
     ],
@@ -474,7 +474,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p class='red-text'>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>",
       "<p>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</p>"
@@ -507,7 +507,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p class='red-text'>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>",
       "<p class='red-text'>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</p>"
@@ -546,7 +546,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p class='red-text'>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>",
       "<p class='red-text'>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</p>"
@@ -588,7 +588,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p class='red-text'>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>",
       "<p class='red-text'>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</p>"
@@ -627,7 +627,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p class='red-text'>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>",
       "<p class='red-text'>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</p>"
@@ -664,7 +664,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<img src='https://bit.ly/fcc-kittens'/>",
       "",
@@ -709,7 +709,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<img class='smaller-image' src='https://bit.ly/fcc-kittens'/>",
       "",
@@ -758,7 +758,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<img class='smaller-image thick-green-border' src='https://bit.ly/fcc-kittens'/>",
       "",
@@ -806,7 +806,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<img class='smaller-image thick-green-border' src='https://bit.ly/fcc-kittens'/>",
       "",
@@ -857,7 +857,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<img class='smaller-image thick-green-border' src='https://bit.ly/fcc-kittens'/>",
       "",
@@ -908,7 +908,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<a href='http://www.catphotoapp.com'>cat photos</a>",
       "",
@@ -961,7 +961,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='http://www.catphotoapp.com'>cat photos</a>.</p>",
       "",
@@ -1014,7 +1014,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1067,7 +1067,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1119,7 +1119,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1174,7 +1174,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1230,7 +1230,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1292,7 +1292,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1355,7 +1355,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1418,7 +1418,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1483,7 +1483,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1550,7 +1550,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1616,7 +1616,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1635,9 +1635,9 @@
       "  <li>other cats</li>",
       "</ol>",
       "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
       "  <input type='text' placeholder='enter cat photo URL' required>",
-      "  <label><input type='radio' name='indoor-outdoor'>Indoor</label>",
-      "  <label><input type='radio' name='indoor-outdoor'>Outdoor</label>",
       "  <button type='submit'>Submit</button>",
       "</form>"
     ],
@@ -1684,7 +1684,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1703,12 +1703,12 @@
       "  <li>other cats</li>",
       "</ol>",
       "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
       "  <input type='text' placeholder='enter cat photo URL' required>",
-      "  <label><input type='radio' name='indoor-outdoor'>Indoor</label>",
-      "  <label><input type='radio' name='indoor-outdoor'>Outdoor</label>",
-      "  <label><input type='checkbox' name='personality'>Loving</label>",
-      "  <label><input type='checkbox' name='personality'>Lazy</label>",
-      "  <label><input type='checkbox' name='personality'>Crazy</label>",
       "  <button type='submit'>Submit</button>",
       "</form>"
     ],
@@ -1756,7 +1756,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1775,15 +1775,14 @@
       "  <li>other cats</li>",
       "</ol>",
       "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
       "  <input type='text' placeholder='enter cat photo URL' required>",
-      "  <br>",
-      "  <label><input type='radio' name='indoor-outdoor'>Indoor</label>",
-      "  <label><input type='radio' name='indoor-outdoor'>Outdoor</label>",
-      "  <br>",
-      "  <label><input type='checkbox' name='personality'>Loving</label>",
-      "  <label><input type='checkbox' name='personality'>Lazy</label>",
-      "  <label><input type='checkbox' name='personality'>Crazy</label>",
-      "  <br>",
       "  <button type='submit'>Submit</button>",
       "</form>"
     ],
@@ -1834,7 +1833,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1853,15 +1852,14 @@
       "  <li>other cats</li>",
       "</ol>",
       "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
       "  <input type='text' placeholder='enter cat photo URL' required>",
-      "  <br>",
-      "  <label><input type='radio' name='indoor-outdoor'>Indoor</label>",
-      "  <label><input type='radio' name='indoor-outdoor'>Outdoor</label>",
-      "  <br>",
-      "  <label><input type='checkbox' name='personality'>Loving</label>",
-      "  <label><input type='checkbox' name='personality'>Lazy</label>",
-      "  <label><input type='checkbox' name='personality'>Crazy</label>",
-      "  <br>",
       "  <button type='submit'>Submit</button>",
       "</form>"
     ],
@@ -1907,7 +1905,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -1927,15 +1925,14 @@
       "  <li>other cats</li>",
       "</ol>",
       "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
       "  <input type='text' placeholder='enter cat photo URL' required>",
-      "  <br>",
-      "  <label><input type='radio' name='indoor-outdoor'>Indoor</label>",
-      "  <label><input type='radio' name='indoor-outdoor'>Outdoor</label>",
-      "  <br>",
-      "  <label><input type='checkbox' name='personality'>Loving</label>",
-      "  <label><input type='checkbox' name='personality'>Lazy</label>",
-      "  <label><input type='checkbox' name='personality'>Crazy</label>",
-      "  <br>",
       "  <button type='submit'>Submit</button>",
       "</form>"
     ],
@@ -1981,7 +1978,7 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text text-center'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
@@ -2001,15 +1998,14 @@
       "  <li>other cats</li>",
       "</ol>",
       "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
       "  <input type='text' placeholder='enter cat photo URL' required>",
-      "  <br>",
-      "  <label><input type='radio' name='indoor-outdoor'>Indoor</label>",
-      "  <label><input type='radio' name='indoor-outdoor'>Outdoor</label>",
-      "  <br>",
-      "  <label><input type='checkbox' name='personality'>Loving</label>",
-      "  <label><input type='checkbox' name='personality'>Lazy</label>",
-      "  <label><input type='checkbox' name='personality'>Crazy</label>",
-      "  <br>",
       "  <button type='submit'>Submit</button>",
       "</form>"
     ],
@@ -2055,14 +2051,14 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text text-center'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
       "<a href='#'><img class='smaller-image thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
       "",
       "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
-      "<button class='btn'>like this photo</button>",
+      "<button class='btn'>Like</button>",
       "<p>Things cats love:</p>",
       "<ul>",
       "  <li>cat nip</li>",
@@ -2076,15 +2072,14 @@
       "  <li>other cats</li>",
       "</ol>",
       "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
       "  <input type='text' placeholder='enter cat photo URL' required>",
-      "  <br>",
-      "  <label><input type='radio' name='indoor-outdoor'>Indoor</label>",
-      "  <label><input type='radio' name='indoor-outdoor'>Outdoor</label>",
-      "  <br>",
-      "  <label><input type='checkbox' name='personality'>Loving</label>",
-      "  <label><input type='checkbox' name='personality'>Lazy</label>",
-      "  <label><input type='checkbox' name='personality'>Crazy</label>",
-      "  <br>",
       "  <button type='submit'>Submit</button>",
       "</form>"
     ],
@@ -2130,14 +2125,14 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text text-center'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
       "<a href='#'><img class='smaller-image thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
       "",
       "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
-      "<button class='btn btn-block'>like this photo</button>",
+      "<button class='btn btn-block'>Like</button>",
       "<p>Things cats love:</p>",
       "<ul>",
       "  <li>cat nip</li>",
@@ -2151,15 +2146,14 @@
       "  <li>other cats</li>",
       "</ol>",
       "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
       "  <input type='text' placeholder='enter cat photo URL' required>",
-      "  <br>",
-      "  <label><input type='radio' name='indoor-outdoor'>Indoor</label>",
-      "  <label><input type='radio' name='indoor-outdoor'>Outdoor</label>",
-      "  <br>",
-      "  <label><input type='checkbox' name='personality'>Loving</label>",
-      "  <label><input type='checkbox' name='personality'>Lazy</label>",
-      "  <label><input type='checkbox' name='personality'>Crazy</label>",
-      "  <br>",
       "  <button type='submit'>Submit</button>",
       "</form>"
     ],
@@ -2170,7 +2164,7 @@
     "name": "Color a Bootstrap Button with Button Info",
     "difficulty": 0.052,
     "description": [
-      "Create a new block-level Bootstrap button below your \"like this photo\" button with the text \"more info about this photo\", and add Bootstrap's <code>btn-info</code> class to it.",
+      "Create a new block-level Bootstrap button below your \"like\" button with the text \"Info\", and add Bootstrap's <code>btn-info</code> class to it.",
       "Bootstrap comes with several pre-defined colors for buttons. The <code>btn-primary</code> class is the main button color you'll use throughout your app.",
       "Note that these buttons still need the <code>btn</code> and <code>btn-block</code> classes."
     ],
@@ -2206,14 +2200,14 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text text-center'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
       "<a href='#'><img class='smaller-image thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
       "",
       "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
-      "<button class='btn btn-block btn-primary'>like this photo</button>",
+      "<button class='btn btn-block btn-primary'>Like</button>",
       "<p>Things cats love:</p>",
       "<ul>",
       "  <li>cat nip</li>",
@@ -2227,15 +2221,14 @@
       "  <li>other cats</li>",
       "</ol>",
       "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
       "  <input type='text' placeholder='enter cat photo URL' required>",
-      "  <br>",
-      "  <label><input type='radio' name='indoor-outdoor'>Indoor</label>",
-      "  <label><input type='radio' name='indoor-outdoor'>Outdoor</label>",
-      "  <br>",
-      "  <label><input type='checkbox' name='personality'>Loving</label>",
-      "  <label><input type='checkbox' name='personality'>Lazy</label>",
-      "  <label><input type='checkbox' name='personality'>Crazy</label>",
-      "  <br>",
       "  <button type='submit'>Submit</button>",
       "</form>"
     ],
@@ -2246,12 +2239,12 @@
     "name": "Warn your Users of a Dangerous Action with the Bootstrap Button Danger Class",
     "difficulty": 0.053,
     "description": [
-      "Change the \"Delete\" button from <code>btn-primary</code> to <code>btn-danger</code>.",
+      "Create a button with the text \"delete\" and give it the class <code>btn-danger</code>.",
       "Bootstrap comes with several pre-defined colors for buttons. The <code>btn-danger</code> class is the button color you'll use to notify users that the button performs a destructive action, such as deleting a cat photo.",
       "Note that this button still needs the <code>btn</code> and <code>btn-block</code> classes."
     ],
     "tests": [
-      "assert($('.btn-danger').length > 0, 'your new button should have the class \"btn-danger\".')",
+      "assert($('.btn-danger').length > 0, 'Your new button should have the class \"btn-danger\".')",
       "assert($('.btn-block').length > 1, 'Both of your Bootstrap buttons should have the class \"btn-block\".')"
     ],
     "challengeSeed": [
@@ -2282,15 +2275,15 @@
       "  }",
       "</style>",
       "",
-      "<h2 class='red-text'>Cat Photo App</h2>",
+      "<h2 class='red-text text-center'>CatPhotoApp</h2>",
       "",
       "<p>Click here for <a href='#'>cat photos</a>.</p>",
       "",
       "<a href='#'><img class='smaller-image thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
       "",
       "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
-      "<button class='btn btn-block btn-primary'>like this photo</button>",
-      "<button class='btn btn-block btn-info'>more info about this photo</button>",
+      "<button class='btn btn-block btn-primary'>Like</button>",
+      "<button class='btn btn-block btn-info'>Info</button>",
       "<p>Things cats love:</p>",
       "<ul>",
       "  <li>cat nip</li>",
@@ -2304,15 +2297,14 @@
       "  <li>other cats</li>",
       "</ol>",
       "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
       "  <input type='text' placeholder='enter cat photo URL' required>",
-      "  <br>",
-      "  <label><input type='radio' name='indoor-outdoor'>Indoor</label>",
-      "  <label><input type='radio' name='indoor-outdoor'>Outdoor</label>",
-      "  <br>",
-      "  <label><input type='checkbox' name='personality'>Loving</label>",
-      "  <label><input type='checkbox' name='personality'>Lazy</label>",
-      "  <label><input type='checkbox' name='personality'>Crazy</label>",
-      "  <br>",
       "  <button type='submit'>Submit</button>",
       "</form>"
     ],
@@ -2320,177 +2312,752 @@
   },
   {
     "_id": "bad88fee1348ce8acef08815",
-    "name": "Use the Bootstrap Grid to Put Two Elements Side By Side",
+    "name": "Use the Bootstrap Grid to Put Elements Side By Side",
     "difficulty": 0.054,
     "description": [
-      "Put the \"Like\" and \"Delete\" buttons side-by-side by wrapping them in both in a <code>&#60;div class=\"row\"&#62;</code> element and each of them in a <code>&#60;div class=\"row\"&#62;</code> element.",
+      "Put the \"like\", \"Info\" and \"Delete\" buttons side-by-side by wrapping them in both in a <code>&#60;div class=\"row\"&#62;</code> element and each of them in a <code>&#60;div class=\"col-xs-4\"&#62;</code> element.",
       "Bootstrap uses a responsive grid system, which makes it easy to put elements into rows and specify each element's relative width. Most of Bootstrap's classes can be applied to a <code>div</code> element.",
-      "The <code>row</code> class is applied to a <code>div</element</code>, and the buttons themselves can be <code>nested</code> within it."
+      "The <code>row</code> class is applied to a <code>div</code>, and the buttons themselves can be <code>nested</code> within it."
     ],
     "tests": [
-      "expect($('.row').length).to.eql(2);",
-      "expect($('.col-xs-12').length).to.eql(4);"
+      "assert($('.row').length > 0, 'Your new button should be wrapped within a div with the class \"row\".')",
+      "assert($('.col-xs-4').length > 2, 'Each of your bootstrap buttons should be wrapped in a div with the class \"col-xs-4\".')"
     ],
     "challengeSeed": [
+      "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
       "<style>",
+      "  .red-text {",
+      "    color: red;",
+      "  }",
+      "",
+      "  h2 {",
+      "    font-family: Lobster, Monospace;",
+      "  }",
+      "",
+      "  p {",
+      "    font-size: 16px;",
+      "    font-family: Monospace;",
+      "  }",
+      "",
       "  .thick-green-border {",
-      "    border-style: solid;",
-      "    border-color: #00ff00;",
+      "    border-color: green;",
       "    border-width: 10px;",
+      "    border-style: solid;",
       "    border-radius: 50%;",
       "  }",
+      "",
+      "  .smaller-image {",
+      "    width: 100px;",
+      "  }",
       "</style>",
-      "<h2 class=\"text-center\">cat photo app</h2>",
-      "<img class=\"thick-green-border img-responsive\" src=\"http://bit.ly/cutegraycat\"/>",
-      "<br/>",
-      "<div class=\"row\">",
-      "  <div class=\"col-xs-6\">",
-      "    <button class=\"btn btn-block btn-success\" href=\"#\">Back</button>",
-      "  </div>",
-      "  <div class=\"col-xs-6\">",
-      "    <button class=\"btn btn-block btn-primary\" href=\"#\">Delete</button>",
-      "  </div>",
-      "</div>",
-      "<button class=\"btn btn-block btn-primary\" href=\"#\">Like</button>",
-      "<br/>",
-      "<button class=\"btn btn-block btn-primary\" href=\"#\">Delete</button>"
-    ],
-    "challengeType": 0
-  },
-  {
-    "_id": "bad89fee1348ce8acef08816",
-    "name": "Wrap Side By Side Elements in a Bootstrap Row",
-    "difficulty": 0.055,
-    "description": [
-      "Put the \"Like\" and \"Delete\" buttons side-by-side by wrapping them in both in a <code>&#60;div class=\"row\"&#62;</code> element and each of them in a <code>&#60;div class=\"row\"&#62;</code> element.",
-      "Bootstrap uses a responsive grid system, which makes it easy to put elements into rows and specify each element's relative width. Most of Bootstrap's classes can be applied to a <code>div</code> element.",
-      "The <code>row</code> class is applied to a <code>div</element</code>, and the buttons themselves can be <code>nested</code> within it."
-    ],
-    "tests": [
-      "expect($('.row').length).to.eql(2);",
-      "expect($('.col-xs-12').length).to.eql(4);"
-    ],
-    "challengeSeed": [
-      "<style>",
-      "  .thick-green-border {",
-      "    border-style: solid;",
-      "    border-color: #00ff00;",
-      "    border-width: 10px;",
-      "    border-radius: 50%;",
-      "  }",
-      "</style>",
-      "<h2 class=\"text-center\">cat photo app</h2>",
-      "<img class=\"thick-green-border img-responsive\" src=\"http://bit.ly/cutegraycat\"/>",
-      "<br/>",
-      "<div class=\"row\">",
-      "  <div class=\"col-xs-6\">",
-      "    <button class=\"btn btn-block btn-success\" href=\"#\">Back</button>",
-      "  </div>",
-      "  <div class=\"col-xs-6\">",
-      "    <button class=\"btn btn-block btn-primary\" href=\"#\">Delete</button>",
-      "  </div>",
-      "</div>",
-      "<button class=\"btn btn-block btn-primary\" href=\"#\">Like</button>",
-      "<br/>",
-      "<button class=\"btn btn-block btn-primary\" href=\"#\">Delete</button>"
+      "",
+      "<h2 class='red-text text-center'>CatPhotoApp</h2>",
+      "",
+      "<p>Click here for <a href='#'>cat photos</a>.</p>",
+      "",
+      "<a href='#'><img class='smaller-image thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
+      "",
+      "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+      "<button class='btn btn-block btn-primary'>Like</button>",
+      "<button class='btn btn-block btn-info'>Info</button>",
+      "<button class='btn btn-block btn-danger'>Delete</button>",
+      "<p>Things cats love:</p>",
+      "<ul>",
+      "  <li>cat nip</li>",
+      "  <li>laser pointers</li>",
+      "  <li>lasagna</li>",
+      "</ul>",
+      "<p>Top 3 things cats hate:</p>",
+      "<ol>",
+      "  <li>flea treatment</li>",
+      "  <li>thunder</li>",
+      "  <li>other cats</li>",
+      "</ol>",
+      "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
+      "  <input type='text' placeholder='enter cat photo URL' required>",
+      "  <button type='submit'>Submit</button>",
+      "</form>"
     ],
     "challengeType": 0
   },
+
   {
     "_id" : "bad87fee1348bd9aedf08845",
-    "name": "Make a Navbar",
+    "name": "Use Bootstrap Text Primary Class instead of Custom CSS",
     "difficulty" : 0.056,
     "description": [
-      "",
-      ""
+      "Delete the following from your style tag: <code>.red-text</code>, <code>p</code>, <code>.smaller-image</code>. Delete the <code>p</code> element with the dead link. Remove your <code>red-text</code> class from your <code>h2</code> element and instead apply the <code>text-primary</code> Bootstrap class. Replace the <code>smaller-image</code> class on your top image with the <code>img-responsive</code> class."
     ],
     "tests": [
-      "expect($('h1')).to.have.class('text-center');",
-      "expect($('h1')).to.have.text('hello world');"
+      "assert(!$('h2').hasClass('red-text'), 'You h2 element should no longer have the class \"red-text\".')",
+      "assert($('h2').hasClass('text-primary'), 'You h2 element should now have the class \"text-primary\".')",
+      "assert(!$('p').css('font-family').match(/monospace/i), 'Your paragraph elements should no longer use the font \"Monospace\".')",
+      "assert($('.img-responsive').length > 1, 'Remove the \"smaller-image\" class from your top image and replace it with the \"img-responsive\" class.')"
     ],
     "challengeSeed": [
-      "<h1>hello world</h1>"
+      "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
+      "<style>",
+      "  .red-text {",
+      "    color: red;",
+      "  }",
+      "",
+      "  h2 {",
+      "    font-family: Lobster, Monospace;",
+      "  }",
+      "",
+      "  p {",
+      "    font-size: 16px;",
+      "    font-family: Monospace;",
+      "  }",
+      "",
+      "  .thick-green-border {",
+      "    border-color: green;",
+      "    border-width: 10px;",
+      "    border-style: solid;",
+      "    border-radius: 50%;",
+      "  }",
+      "",
+      "  .smaller-image {",
+      "    width: 100px;",
+      "  }",
+      "</style>",
+      "",
+      "<h2 class='red-text text-center'>CatPhotoApp</h2>",
+      "",
+      "<p>Click here for <a href='#'>cat photos</a>.</p>",
+      "",
+      "<a href='#'><img class='smaller-image thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
+      "",
+      "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+      "<br>",
+      "<div class='row'>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-primary'>Like</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-info'>Info</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-danger'>Delete</button>",
+      "  </div>",
+      "</div>",
+      "<p>Things cats love:</p>",
+      "<ul>",
+      "  <li>cat nip</li>",
+      "  <li>laser pointers</li>",
+      "  <li>lasagna</li>",
+      "</ul>",
+      "<p>Top 3 things cats hate:</p>",
+      "<ol>",
+      "  <li>flea treatment</li>",
+      "  <li>thunder</li>",
+      "  <li>other cats</li>",
+      "</ol>",
+      "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
+      "  <input type='text' placeholder='enter cat photo URL' required>",
+      "  <button type='submit'>Submit</button>",
+      "</form>"
     ],
     "challengeType": 0,
     "completionMessage": ""
   },
 
   {
-    "_id" : "bad87fee1348bd9aedf08847",
-    "name": "Add a Logo to a Navbar",
+    "_id" : "bad87fee1348bd9aede08845",
+    "name": "Create a Custom Heading",
     "difficulty" : 0.057,
     "description": [
-      "",
-      ""
+      "Wrap your first image and your h2 element in a <code>&#60;div class='row'&#62;</code> element. Wrap your h2 text in a <code>&#60;div class='col-xs-8'&#62;</code> and your image in a <code>&#60;div class='col-xs-4'&#62;</code> so that they are on the same line."
     ],
     "tests": [
-      "expect($('h1')).to.have.class('text-center');",
-      "expect($('h1')).to.have.text('hello world');"
+      "assert($('.row').length > 1, 'Your h2 and top image elements should both be wrapped together within a div with the class \"row\".')",
+      "assert($('.col-xs-4').length > 3, 'Wrap your top image inside a div with the class \"col-xs-4\".')",
+      "assert($('.col-xs-8').length > 0, 'Wrap your h2 element inside a div with the class \"col-xs-8\".')"
     ],
     "challengeSeed": [
-      "<h1>hello world</h1>"
+      "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
+      "",
+      "<style>",
+      "  h2 {",
+      "    font-family: Lobster, Monospace;",
+      "  }",
+      "",
+      "  .thick-green-border {",
+      "    border-color: green;",
+      "    border-width: 10px;",
+      "    border-style: solid;",
+      "    border-radius: 50%;",
+      "  }",
+      "</style>",
+      "",
+      "<h2 class='text-primary text-center'>CatPhotoApp</h2>",
+      "",
+      "<a href='#'><img class='img-responsive' src='https://bit.ly/fcc-kittens'/></a>",
+      "",
+      "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+      "<br>",
+      "<div class='row'>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-primary'>Like</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-info'>Info</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-danger'>Delete</button>",
+      "  </div>",
+      "</div>",
+      "<p>Things cats love:</p>",
+      "<ul>",
+      "  <li>cat nip</li>",
+      "  <li>laser pointers</li>",
+      "  <li>lasagna</li>",
+      "</ul>",
+      "<p>Top 3 things cats hate:</p>",
+      "<ol>",
+      "  <li>flea treatment</li>",
+      "  <li>thunder</li>",
+      "  <li>other cats</li>",
+      "</ol>",
+      "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
+      "  <input type='text' placeholder='enter cat photo URL' required>",
+      "  <button type='submit'>Submit</button>",
+      "</form>"
     ],
     "challengeType": 0,
     "completionMessage": ""
   },
 
   {
-    "_id" : "bad87fee1348bd9aedf08848",
-    "name": "Make a Footer",
+    "_id" : "bad87fee1348bd9aedd08845",
+    "name": "Add Font Awesome Icons to our Buttons",
     "difficulty" : 0.058,
     "description": [
-      "",
-      ""
+      "Use Font Awesome to add a \"like\" icon to your like button.",
+      "You should add a <code>&#60;i class=\"fa fa-thumbs-up\"&#62;</code> within your like button's element."
     ],
     "tests": [
-      "expect($('h1')).to.have.class('text-center');",
-      "expect($('h1')).to.have.text('hello world');"
+      "assert($('.fa-thumbs-up').length > 0, 'You should add a <code>&#60;i class=\"fa fa-thumbs-up\"&#62;&#60;i&#62;</code> within your like button element.')"
     ],
     "challengeSeed": [
-      "<h1>hello world</h1>"
+      "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
+      "<style>",
+      "  h2 {",
+      "    font-family: Lobster, Monospace;",
+      "  }",
+      "",
+      "  .thick-green-border {",
+      "    border-color: green;",
+      "    border-width: 10px;",
+      "    border-style: solid;",
+      "    border-radius: 50%;",
+      "  }",
+      "</style>",
+      "",
+      "<div class='row'>",
+      "  <div class='col-xs-8'>",
+      "    <h2 class='text-primary text-center'>CatPhotoApp</h2>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <a href='#'><img class='img-responsive thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
+      "  </div>",
+      "</div>",
+      "<br>",
+      "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+      "<br>",
+      "<div class='row'>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-primary'>Like</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-info'>Info</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-danger'>Delete</button>",
+      "  </div>",
+      "</div>",
+      "<p>Things cats love:</p>",
+      "<ul>",
+      "  <li>cat nip</li>",
+      "  <li>laser pointers</li>",
+      "  <li>lasagna</li>",
+      "</ul>",
+      "<p>Top 3 things cats hate:</p>",
+      "<ol>",
+      "  <li>flea treatment</li>",
+      "  <li>thunder</li>",
+      "  <li>other cats</li>",
+      "</ol>",
+      "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
+      "  <input type='text' placeholder='enter cat photo URL' required>",
+      "  <button type='submit'>Submit</button>",
+      "</form>"
     ],
     "challengeType": 0,
     "completionMessage": ""
   },
 
   {
-    "_id" : "bad87fee1348bd9aedf08849",
-    "name": "Use Icons as Links",
+    "_id" : "bad87fee1348bd9aedc08845",
+    "name": "Add Font Awesome Icons all of our Buttons",
     "difficulty" : 0.059,
     "description": [
-      "",
-      ""
+      "Use Font Awesome to add a \"info-circle\" icon to your info button and a \"trash\" button to your delete button.",
+      "You should add a <code>&#60;i class=\"fa fa-thumbs-up\"&#62;</code> within your like button's element."
     ],
     "tests": [
-      "expect($('h1')).to.have.class('text-center');",
-      "expect($('h1')).to.have.text('hello world');"
+      "assert($('.fa-trash').length > 0, 'You should add a <code>&#60;i class=\"fa fa-trash\"&#62;&#60;i&#62;</code> within your like button element.')",
+      "assert($('.fa-info-circle').length > 0, 'You should add a <code>&#60;i class=\"fa fa-info-circle\"&#62;&#60;i&#62;</code> within your like button element.')"
     ],
     "challengeSeed": [
-      "<h1>hello world</h1>"
+      "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
+      "<style>",
+      "  h2 {",
+      "    font-family: Lobster, Monospace;",
+      "  }",
+      "",
+      "  .thick-green-border {",
+      "    border-color: green;",
+      "    border-width: 10px;",
+      "    border-style: solid;",
+      "    border-radius: 50%;",
+      "  }",
+      "</style>",
+      "",
+      "<div class='row'>",
+      "  <div class='col-xs-8'>",
+      "    <h2 class='text-primary text-center'>CatPhotoApp</h2>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <a href='#'><img class='img-responsive thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
+      "  </div>",
+      "</div>",
+      "<br>",
+      "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+      "<br>",
+      "<div class='row'>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-info'>Info</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-danger'>Delete</button>",
+      "  </div>",
+      "</div>",
+      "<p>Things cats love:</p>",
+      "<ul>",
+      "  <li>cat nip</li>",
+      "  <li>laser pointers</li>",
+      "  <li>lasagna</li>",
+      "</ul>",
+      "<p>Top 3 things cats hate:</p>",
+      "<ol>",
+      "  <li>flea treatment</li>",
+      "  <li>thunder</li>",
+      "  <li>other cats</li>",
+      "</ol>",
+      "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
+      "  <input type='text' placeholder='enter cat photo URL' required>",
+      "  <button type='submit'>Submit</button>",
+      "</form>"
     ],
     "challengeType": 0,
     "completionMessage": ""
   },
 
   {
-    "_id" : "bad87fee1348bd9aedf08851",
-    "name": "Add Depth to a Page with a Well",
+    "_id" : "bad87fee1348bd9aedb08845",
+    "name": "Use Bootstrap to Responsively Style a Radio Buttons",
     "difficulty" : 0.060,
     "description": [
-      "",
-      ""
+      "Wrap all of your radio buttons in a <code>&#60;div class='row'&#62;</code> element. Then wrap each of them in a <code>&#60;div class='col-xs-6'&#62;</code> element."
     ],
     "tests": [
-      "expect($('h1')).to.have.class('text-center');",
-      "expect($('h1')).to.have.text('hello world');"
+      "assert($('.row').length > 2, 'Wrap your all of your radio buttons inside one div with the class \"row\".')",
+      "assert($('.col-xs-6').length > 3, 'Wrap each of your radio buttons inside its own div with the class \"col-xs-6\".')"
     ],
     "challengeSeed": [
-      "<h1>hello world</h1>"
+      "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
+      "<style>",
+      "  h2 {",
+      "    font-family: Lobster, Monospace;",
+      "  }",
+      "",
+      "  .thick-green-border {",
+      "    border-color: green;",
+      "    border-width: 10px;",
+      "    border-style: solid;",
+      "    border-radius: 50%;",
+      "  }",
+      "</style>",
+      "",
+      "<div class='row'>",
+      "  <div class='col-xs-8'>",
+      "    <h2 class='text-primary text-center'>CatPhotoApp</h2>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <a href='#'><img class='img-responsive thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
+      "  </div>",
+      "</div>",
+      "<br>",
+      "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+      "<br>",
+      "<div class='row'>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+      "  </div>",
+      "</div>",
+      "<p>Things cats love:</p>",
+      "<ul>",
+      "  <li>cat nip</li>",
+      "  <li>laser pointers</li>",
+      "  <li>lasagna</li>",
+      "</ul>",
+      "<p>Top 3 things cats hate:</p>",
+      "<ol>",
+      "  <li>flea treatment</li>",
+      "  <li>thunder</li>",
+      "  <li>other cats</li>",
+      "</ol>",
+      "<form action=\"/submit-cat-photo\">",
+      "  <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "  <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
+      "  <input type='text' placeholder='enter cat photo URL' required>",
+      "  <button type='submit'>Submit</button>",
+      "</form>"
     ],
     "challengeType": 0,
     "completionMessage": ""
   },
 
+  {
+    "_id" : "bad87fee1348bd9aeda08845",
+    "name": "Use Bootstrap to Responsively Style Checkboxes",
+    "difficulty" : 0.061,
+    "description": [
+      "Wrap all your checkboxes in a <code>&#60;div class='row'&#62;</code> element. Then wrap each of them in a <code>&#60;div class='col-xs-4'&#62;</code> element."
+    ],
+    "tests": [
+      "assert($('.row').length > 3, 'Wrap your all of your checkboxes inside one div with the class \"row\".')",
+      "assert($('.col-xs-4').length > 6, 'Wrap each of your checkboxes inside its own div with the class \"col-xs-4\".')"
+    ],
+    "challengeSeed": [
+      "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
+      "<style>",
+      "  h2 {",
+      "    font-family: Lobster, Monospace;",
+      "  }",
+      "",
+      "  .thick-green-border {",
+      "    border-color: green;",
+      "    border-width: 10px;",
+      "    border-style: solid;",
+      "    border-radius: 50%;",
+      "  }",
+      "",
+      "</style>",
+      "",
+      "<div class='row'>",
+      "  <div class='col-xs-8'>",
+      "    <h2 class='text-primary text-center'>CatPhotoApp</h2>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <a href='#'><img class='img-responsive thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
+      "  </div>",
+      "</div>",
+      "<br>",
+      "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+      "<br>",
+      "<div class='row'>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+      "  </div>",
+      "</div>",
+      "<p>Things cats love:</p>",
+      "<ul>",
+      "  <li>cat nip</li>",
+      "  <li>laser pointers</li>",
+      "  <li>lasagna</li>",
+      "</ul>",
+      "<p>Top 3 things cats hate:</p>",
+      "<ol>",
+      "  <li>flea treatment</li>",
+      "  <li>thunder</li>",
+      "  <li>other cats</li>",
+      "</ol>",
+      "<form action=\"/submit-cat-photo\">",
+      "  <div class='row'>",
+      "    <div class='col-xs-6'>",
+      "      <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "    </div>",
+      "    <div class='col-xs-6'>",
+      "      <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "    </div>",
+      "  </div>",
+      "  <br>",
+      "  <label><input type='checkbox' name='personality'> Loving</label>",
+      "  <label><input type='checkbox' name='personality'> Lazy</label>",
+      "  <label><input type='checkbox' name='personality'> Crazy</label>",
+      "  <br>",
+      "  <input type='text' placeholder='enter cat photo URL' required>",
+      "  <button type='submit'>Submit</button>",
+      "</form>"
+    ],
+    "challengeType": 0,
+    "completionMessage": ""
+  },
+
+  {
+    "_id" : "bad87fee1348bd9aed908845",
+    "name": "Use a Bootstrap Input Group",
+    "difficulty" : 0.062,
+    "description": [
+      "Wrap all your checkboxes in a <code>&#60;div class='row'&#62;</code> element. Then wrap each of them in a <code>&#60;div class='col-xs-4'&#62;</code> element."
+    ],
+    "tests": [
+      "assert($('.row').length > 3, 'Wrap your all of your checkboxes inside one div with the class \"row\".')",
+      "assert($('.col-xs-4').length > 6, 'Wrap each of your checkboxes inside its own div with the class \"col-xs-4\".')"
+    ],
+    "challengeSeed": [
+      "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
+      "<style>",
+      "  h2 {",
+      "    font-family: Lobster, Monospace;",
+      "  }",
+      "",
+      "  .thick-green-border {",
+      "    border-color: green;",
+      "    border-width: 10px;",
+      "    border-style: solid;",
+      "    border-radius: 50%;",
+      "  }",
+      "",
+      "</style>",
+      "",
+      "<div class='row'>",
+      "  <div class='col-xs-8'>",
+      "    <h2 class='text-primary text-center'>CatPhotoApp</h2>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <a href='#'><img class='img-responsive thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
+      "  </div>",
+      "</div>",
+      "<br>",
+      "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+      "<br>",
+      "<div class='row'>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+      "  </div>",
+      "</div>",
+      "<p>Things cats love:</p>",
+      "<ul>",
+      "  <li>cat nip</li>",
+      "  <li>laser pointers</li>",
+      "  <li>lasagna</li>",
+      "</ul>",
+      "<p>Top 3 things cats hate:</p>",
+      "<ol>",
+      "  <li>flea treatment</li>",
+      "  <li>thunder</li>",
+      "  <li>other cats</li>",
+      "</ol>",
+      "<form action=\"/submit-cat-photo\">",
+      "  <br>",
+      "  <div class='row'>",
+      "    <div class='col-xs-6'>",
+      "      <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "    </div>",
+      "    <div class='col-xs-6'>",
+      "      <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "    </div>",
+      "  </div>",
+      "  <br>",
+      "  <div class='row'>",
+      "    <div class='col-xs-4'>",
+      "      <label><input type='checkbox' name='personality'> Loving</label>",
+      "    </div>",
+      "    <div class='col-xs-4'>",
+      "      <label><input type='checkbox' name='personality'> Lazy</label>",
+      "    </div>",
+      "    <div class='col-xs-4'>",
+      "      <label><input type='checkbox' name='personality'> Crazy</label>",
+      "    </div>",
+      "  </div>",
+      "  <br>",
+      "  <input type='text' placeholder='enter cat photo URL' required>",
+      "  <button type='submit'>Submit</button>",
+      "</form>"
+    ],
+    "challengeType": 0,
+    "completionMessage": ""
+  },
+
+  {
+    "_id" : "bad87fee1348bd9aec908845",
+    "name": "Use a Bootstrap Input Group",
+    "difficulty" : 0.063,
+    "description": [
+      "Wrap all your checkboxes in a <code>&#60;div class='row'&#62;</code> element. Then wrap each of them in a <code>&#60;div class='col-xs-4'&#62;</code> element."
+    ],
+    "tests": [
+
+    ],
+    "challengeSeed": [
+      "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
+      "<style>",
+      "  h2 {",
+      "    font-family: Lobster, Monospace;",
+      "  }",
+      "",
+      "  .thick-green-border {",
+      "    border-color: green;",
+      "    border-width: 10px;",
+      "    border-style: solid;",
+      "    border-radius: 50%;",
+      "  }",
+      "",
+      "</style>",
+      "",
+      "<div class='row'>",
+      "  <div class='col-xs-8'>",
+      "    <h2 class='text-primary text-center'>CatPhotoApp</h2>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <a href='#'><img class='img-responsive thick-green-border' src='https://bit.ly/fcc-kittens'/></a>",
+      "  </div>",
+      "</div>",
+      "<br>",
+      "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+      "<br>",
+      "<div class='row'>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+      "  </div>",
+      "  <div class='col-xs-4'>",
+      "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+      "  </div>",
+      "</div>",
+      "<p>Things cats love:</p>",
+      "<ul>",
+      "  <li>cat nip</li>",
+      "  <li>laser pointers</li>",
+      "  <li>lasagna</li>",
+      "</ul>",
+      "<p>Top 3 things cats hate:</p>",
+      "<ol>",
+      "  <li>flea treatment</li>",
+      "  <li>thunder</li>",
+      "  <li>other cats</li>",
+      "</ol>",
+      "<form action=\"/submit-cat-photo\">",
+      "  <br>",
+      "  <div class='row'>",
+      "    <div class='col-xs-6'>",
+      "      <label><input type='radio' name='indoor-outdoor'> Indoor</label>",
+      "    </div>",
+      "    <div class='col-xs-6'>",
+      "      <label><input type='radio' name='indoor-outdoor'> Outdoor</label>",
+      "    </div>",
+      "  </div>",
+      "  <br>",
+      "  <div class='row'>",
+      "    <div class='col-xs-4'>",
+      "      <label><input type='checkbox' name='personality'> Loving</label>",
+      "    </div>",
+      "    <div class='col-xs-4'>",
+      "      <label><input type='checkbox' name='personality'> Lazy</label>",
+      "    </div>",
+      "    <div class='col-xs-4'>",
+      "      <label><input type='checkbox' name='personality'> Crazy</label>",
+      "    </div>",
+      "  </div>",
+      "  <br>",
+      "  <div class='input-group'>",
+      "    <input type='text' placeholder='' class='form-control'/>",
+      "      <span class='input-group-btn'>",
+      "        <button type='button' class='btn btn-big btn-primary btn-responsive'>Submit</button>",
+      "      </span>",
+      "  </div>",
+      "</form>"
+    ],
+    "challengeType": 0,
+    "completionMessage": ""
+  },
+
+
+
+
+
+
+
+
+
+
+
   {
     "_id": "bad88fee1348bd9aedf08825",
     "name": "Adjusting the Padding of an Element",