diff --git a/_sass/_base.scss b/_sass/_base.scss
index 9c28e29db0..15d8f08d7b 100644
--- a/_sass/_base.scss
+++ b/_sass/_base.scss
@@ -63,6 +63,16 @@ figcaption {
     font-size: $small-font-size;
 }
 
+.right-figure {
+  float: right;
+  margin: 0 0 5px 20px;
+
+  @include media-query($on-palm) {
+    margin: inherit;
+    float: inherit;
+  }
+}
+
 
 
 /**
diff --git a/_sass/_customstyles.scss b/_sass/_customstyles.scss
index 4df5db3a70..edbf7c11d8 100644
--- a/_sass/_customstyles.scss
+++ b/_sass/_customstyles.scss
@@ -815,3 +815,12 @@ table th code {
 .alert__banner {
     margin-top: 3em;
 }
+
+.h2-like {
+    // This is for headlines that should look like H2 but shouldn't appear
+    // in the TOC.
+    font-size: 24px;
+    font-weight: 300;
+    line-height: 29px;
+    margin-bottom: 15px;
+}
diff --git a/get-started/codelab/images/startup-namer-app.gif b/get-started/codelab/images/startup-namer-app.gif
new file mode 100644
index 0000000000..431d75415d
Binary files /dev/null and b/get-started/codelab/images/startup-namer-app.gif differ
diff --git a/get-started/codelab/index.md b/get-started/codelab/index.md
index e9953d8b16..a7903f2982 100644
--- a/get-started/codelab/index.md
+++ b/get-started/codelab/index.md
@@ -4,6 +4,12 @@ title: Write Your First Flutter App
 permalink: /get-started/codelab/
 ---
 
+<figure class="right-figure" style="max-width: 250px">
+    <img src="images/startup-namer-app.gif" 
+         alt="Animated GIF of the app that you will be building."
+         style="box-shadow: 0 0 3px; margin-bottom: 10px" >
+</figure>
+
 This is a guide to creating your first Flutter app. If you
 are familiar with object-oriented code and basic programming
 concepts such as variables, loops, and conditionals,
@@ -21,23 +27,9 @@ TODO: (later)
   should be consistent: screenshot, code, markdown content.
 {% endcomment %}
 
-[PENDING: Insert animated gif here. The next lines create the
-automated TOC.]]
-
 * TOC
 {:toc}
 
-## What are Flutter and Dart?
-
-_Flutter_ is Google's mobile UI framework for crafting high-quality
-native interfaces on iOS and Android in record time. Flutter works with
-existing code, is used by organizations around the world, and is free
-and open source.
-
-_Dart_ is an application programming language from Google that's
-easy to learn, easy to use, and deployable everywhere.
-Flutter apps are written in Dart.
-
 ## What you'll build
 
 You’ll implement a simple mobile app that generates proposed names for a
@@ -323,7 +315,7 @@ class MyApp extends StatelessWidget {
 
 </ol>
 
-## Problems?
+<p class="h2-like">Problems?</p>
 
 If your app isn't running correctly, look for typos. If needed,
 use the code at the following links to get back on track.
@@ -447,7 +439,7 @@ pairing each time you hot reload or save the app.
 
 <center><img src="images/step3-screenshot.png" alt="screenshot at completion of third step"></center>
 
-## Problems?
+<p class="h2-like">Problems?</p>
 
 If your app isn't running correctly, you can use the code
 at the following links to get back on track.
@@ -595,7 +587,7 @@ as far as you want and you will continue to see new word pairings.
 
 <center><img src="images/step4-screenshot.png" alt="screenshot at completion of fourth step"></center>
 
-## Problems?
+<p class="h2-like">Problems?</p>
 
 If you've gotten off track, you can use the following
 **lib/main.dart** code to get back on track.
@@ -781,7 +773,7 @@ splash animation.
 
 <center><img src="images/step5-screenshot.png" alt="screenshot at completion of 5th step"></center>
 
-## Problems?
+<p class="h2-like">Problems?</p>
 
 If you've gotten off track, you can use the following
 **lib/main.dart** code to get back on track.
@@ -1036,7 +1028,7 @@ Add the highlisted code below:
 xxx: replace images
 <center><img src="images/step6a-screenshot.png" alt="screenshot at completion of 6th step"><img src="images/step6b-screenshot.png" alt="second route"></center>
 
-## Problems?
+<p class="h2-like">Problems?</p>
 
 If you've gotten off track, use the following code for
 **lib/main.dart** to get back on track.
@@ -1193,7 +1185,7 @@ even the app bar.
 </li>
 </ol>
 
-## Problems?
+<p class="h2-like">Problems?</p>
 
 If you've gotten off track, use the code from the following link
 to get back on track.