diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index 3075a3cdfa..c8f0108368 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -89,7 +89,7 @@
       "tests": [
         "assert(($('p').length > 0), 'Create a <code>p</code> element.')",
         "assert.isTrue((/hello(\\s)+paragraph/gi).test($('p').text()), 'Your <code>p</code> element should have the text \"Hello Paragraph\".')",
-        "assert(editor.match(/<\\/p>/g) && editor.match(/<\\/p>/g).length === editor.match(/<p>/g).length, 'Make sure your <code>p</code> element has a closing tag.')"
+        "assert(editor.match(/<\\/p>/g) && editor.match(/<\\/p>/g).length === editor.match(/<p/g).length, 'Make sure your <code>p</code> element has a closing tag.')"
       ],
       "challengeSeed": [
         "<h1>Hello World</h1>",
@@ -364,7 +364,7 @@
       "tests": [
         "assert($('h2').css('color') === 'rgb(0, 0, 255)', 'Your <code>h2</code> element should be blue.')",
         "assert(!$('h2').attr('style'), 'Remove the style attribute from your <code>h2</code> element.')",
-        "assert(($('style').length > 0), 'Create a <code>style</code> element.')",
+        "assert(($('style').length > 1), 'Create a <code>style</code> element.')",
         "assert(editor.match(/<\\/style>/g) && editor.match(/<\\/style>/g).length === editor.match(/<style>/g).length, 'Make sure each of your <code>style</code> elements has a closing tag.')"
       ],
       "challengeSeed": [
@@ -483,7 +483,8 @@
       ],
       "tests": [
         "assert($('p').length > 1, 'You need 2 <code>p</code> elements with Kitty Ipsum text.')",
-        "assert(editor.match(/<\\/p>/g) && editor.match(/<\\/p>/g).length === editor.match(/<p>/g).length, 'Make sure each of your <code>p</code> element has a closing tag.')",
+        "assert(editor.match(/<\\/p>/g) && editor.match(/<\\/p>/g).length === editor.match(/<p/g).length, 'Make sure each of your <code>p</code> elements has a closing tag.')",
+        "assert.isTrue((/Purr\\s+jump\\s+eat/gi).test($('p').text()), 'Your <code>p</code> element should contain the first few words of the provided additional \"Kitty Ipsum\" text.')",
         "assert($('p').css('font-size') === '16px', 'Give your <code>p</code> elements the font-size of 16px.')"
       ],
       "challengeSeed": [
@@ -711,7 +712,7 @@
       ],
       "tests": [
         "assert($('img').length > 0, 'Your page should have an image element.')",
-        "assert($('img').filter(function(index) { return /http://bit.ly/fcc-kittens/gi.test($('img').attr('src')); }).length > 0, 'Your image should have have a <code>src</code> attribute that points to the kitten image.')"
+        "assert($('img').filter(function(index) { return /http:\\/\\/bit\\.ly\\/fcc-kittens/gi.test($('img').attr('src')); }).length > 0, 'Your image should have have a <code>src</code> attribute that points to the kitten image.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -973,7 +974,7 @@
       "name": "Waypoint: Link to External Pages with Anchor Elements",
       "difficulty": 0.031,
       "description": [
-        "Create an <code>a</code> element that links to http://catphotoapp.com and has \"cat photos\" as its anchor text (link text).",
+        "Create an <code>a</code> element, or \"anchor element\", that links to http://catphotoapp.com and has \"cat photos\" as its link text, or \"anchor text\".",
         "Here's a diagram of an <code>a</code> element. In this case, it's used in the middle of a paragraph element, which means your link will appear in the middle of your sentence.",
         "<img class='img-responsive' alt='a diagram of how anchor tags are composed with the same text as on the following line' src='https://www.evernote.com/l/AHSaNaepx_lG9LhhPkVYmagcedpmAeITDsQB/image.png'/>",
         "Here's an example: <code>&#60;p&#62;Here's a &#60;a href='http://freecodecamp.com'&#62; link to Free Code Camp&#60;/a&#62; for you to follow.&#60;/p&#62;</code>."
@@ -981,7 +982,7 @@
       "tests": [
         "assert((/cat photos/gi).test($('a').text()), 'Your <code>a</code> element should have the anchor text of \"cat photos\"')",
         "assert($('a').filter(function(index) { return /com/gi.test($('a').attr('href')); }).length > 0, 'You need an <code>a</code> element that links to <code>http&#58;//catphotoapp.com<code>.')",
-        "assert(editor.match(/<\\/a>/g) && editor.match(/<\\/a>/g).length === editor.match(/<a>/g).length, 'Make sure your <code>a</code> element has a closing tag.')"
+        "assert(editor.match(/<\\/a>/g) && editor.match(/<\\/a>/g).length === editor.match(/<a/g).length, 'Make sure your <code>a</code> element has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
diff --git a/views/resources/jobs-form.jade b/views/resources/jobs-form.jade
index 933fb4b6b8..f7a693ca17 100644
--- a/views/resources/jobs-form.jade
+++ b/views/resources/jobs-form.jade
@@ -1,28 +1,3 @@
-html.
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-    <html>
-    <head>
-    <!--Add the title of your typeform below-->
-    <title>nonprofit-projects</title>
-    <!--CSS styles that ensure your typeform takes up all the available screen space (DO NOT EDIT!)-->
-    <style type="text/css">
-    html{
-        margin: 0;
-    height: 100%;
-    overflow: hidden;
-    }
-    iframe{
-        position: absolute;
-        left:0;
-    right:0;
-    bottom:0;
-    top:0;
-    border:0;
-    }
-    </style>
-    </head>
-    <body>
-    <iframe id="typeform-full" width="100%" height="100%" frameborder="0" src="https://freecodecamp.typeform.com/to/Wkfsts"></iframe>
-    <script type="text/javascript" src="https://s3-eu-west-1.amazonaws.com/share.typeform.com/embed.js"></script>
-    </body>
-    </html>
+extends ../layout
+block content
+    iframe(src="https://docs.google.com/forms/d/1b8JYvQ5ibdwwC0owQ9e9EMRlg22O2wbJgqMvPjiILqs/viewform?embedded=true", frameborder="0", marginheight="0", marginwidth="0", width='102%', height=2100, scrolling="no") Loading...
diff --git a/views/resources/nonprofits-form.jade b/views/resources/nonprofits-form.jade
index be85b628e4..f72ae1e751 100644
--- a/views/resources/nonprofits-form.jade
+++ b/views/resources/nonprofits-form.jade
@@ -1,28 +1,3 @@
-html.
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-    <html>
-    <head>
-    <!--Add the title of your typeform below-->
-    <title>nonprofit-projects</title>
-    <!--CSS styles that ensure your typeform takes up all the available screen space (DO NOT EDIT!)-->
-    <style type="text/css">
-    html{
-        margin: 0;
-    height: 100%;
-    overflow: hidden;
-    }
-    iframe{
-        position: absolute;
-        left:0;
-    right:0;
-    bottom:0;
-    top:0;
-    border:0;
-    }
-    </style>
-    </head>
-    <body>
-    <iframe id="typeform-full" width="100%" height="100%" frameborder="0" src="https://freecodecamp.typeform.com/to/JxMS5a"></iframe>
-    <script type="text/javascript" src="https://s3-eu-west-1.amazonaws.com/share.typeform.com/embed.js"></script>
-    </body>
-    </html>
+extends ../layout
+block content
+    iframe(src="https://docs.google.com/forms/d/1MtQDh8E1Nvkg5jdOucS4LSyk6oMQrN8XTwmQGtgJPAQ/viewform?embedded=true", frameborder="0", marginheight="0", marginwidth="0", width='102%', height=2550, scrolling="no") Loading...
diff --git a/views/resources/pmi-acp-agile-project-managers-form.jade b/views/resources/pmi-acp-agile-project-managers-form.jade
index 781fdb0698..f90b732afe 100644
--- a/views/resources/pmi-acp-agile-project-managers-form.jade
+++ b/views/resources/pmi-acp-agile-project-managers-form.jade
@@ -1,29 +1,3 @@
-html.
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-    <html>
-    <head>
-        <!--Add the title of your typeform below-->
-        <title>PMI-ACP</title>
-
-        <!--CSS styles that ensure your typeform takes up all the available screen space (DO NOT EDIT!)-->
-        <style type="text/css">
-            html{
-                margin: 0;
-                height: 100%;
-                overflow: hidden;
-            }
-            iframe{
-                position: absolute;
-                left:0;
-                right:0;
-                bottom:0;
-                top:0;
-                border:0;
-            }
-        </style>
-    </head>
-    <body>
-    <iframe id="typeform-full" width="100%" height="100%" frameborder="0" src="https://freecodecamp.typeform.com/to/MhH9mp"></iframe>
-    <script type="text/javascript" src="https://s3-eu-west-1.amazonaws.com/share.typeform.com/embed.js"></script>
-    </body>
-    </html>
+extends ../layout
+block content
+    iframe(src="https://docs.google.com/forms/d/1Y9wvQAx5s_puGcC-NRZpKLMgT0iZwajGMbkKlh-piGg/viewform?embedded=true", frameborder="0", marginheight="0", marginwidth="0", width='102%', height=2000, scrolling="no") Loading...