diff --git a/src/main/webapp/components/header.html b/src/main/webapp/components/header.html
index bdf0aa56d..fae681307 100644
--- a/src/main/webapp/components/header.html
+++ b/src/main/webapp/components/header.html
@@ -15,8 +15,8 @@
     <div id="nav-menu" class="navbar-collapse navbar-left collapse">
       <ul class="nav navbar-nav navbar-menu" data-ng-if="getSession() != null">
         <li data-ng-class="$state.is('landing') ? 'active' : ''"><a data-ui-sref="landing">Home</a></li>
-        <li data-ng-class="$state.is('pets') ? 'active' : ''"><a data-ui-sref="pets">Pets</a></li>
         <li data-ng-class="$state.is('owners') ? 'active' : ''"><a data-ui-sref="owners">Owners</a></li>
+        <li data-ng-class="$state.is('pets') ? 'active' : ''"><a data-ui-sref="pets">Pets</a></li>
         <li data-ng-class="$state.is('vets') ? 'active' : ''"><a data-ui-sref="vets">Vets</a></li>
       </ul>
     </div><!-- /.navbar-collapse -->
diff --git a/src/main/webapp/components/landing/_owners.html b/src/main/webapp/components/landing/_owners.html
new file mode 100644
index 000000000..f526f9b28
--- /dev/null
+++ b/src/main/webapp/components/landing/_owners.html
@@ -0,0 +1,93 @@
+<section id="owners" class="sections sections-narrow">
+  <div class="container">
+    <h2 class="sub-header">Browse Owners</h2>
+    <div class="row thumbnail-wrapper">
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/owner-default.png" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Eduardo Rodriguez</h3>
+            <p class="caption-meta">2693 Commerce St., McFarland</p>
+            <p class="caption-meta"><span class="glyphicon glyphicon-phone-alt"></span> +6085558763</p>
+          </div>
+          <div class="action-bar">
+            <ul>
+              <li>
+                <a href="#"><img src="static/dist/images/pet-small.png" class="img-circle" alt="Generic placeholder image" height="30" width="30"></a>
+              </li>
+              <li>
+                <a href="#" class="btn-add-pet"><span class="glyphicon glyphicon-plus"></span></a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/owner-default.png" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Eduardo Rodriguez</h3>
+            <p class="caption-meta">2693 Commerce St., McFarland</p>
+            <p class="caption-meta"><span class="glyphicon glyphicon-phone-alt"></span> +6085558763</p>
+          </div>
+          <div class="action-bar">
+            <ul>
+              <li>
+                <a href="#"><img src="static/dist/images/pet-small.png" class="img-circle" alt="Generic placeholder image" height="30" width="30"></a>
+              </li>
+              <li>
+                <a href="#" class="btn-add-pet"><span class="glyphicon glyphicon-plus"></span></a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/owner-default.png" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Eduardo Rodriguez</h3>
+            <p class="caption-meta">2693 Commerce St., McFarland</p>
+            <p class="caption-meta"><span class="glyphicon glyphicon-phone-alt"></span> +6085558763</p>
+          </div>
+          <div class="action-bar">
+            <ul>
+              <li>
+                <a href="#"><img src="static/dist/images/pet-small.png" class="img-circle" alt="Generic placeholder image" height="30" width="30"></a>
+              </li>
+              <li>
+                <a href="#" class="btn-add-pet"><span class="glyphicon glyphicon-plus"></span></a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/owner-default.png" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Eduardo Rodriguez</h3>
+            <p class="caption-meta">2693 Commerce St., McFarland</p>
+            <p class="caption-meta"><span class="glyphicon glyphicon-phone-alt"></span> +6085558763</p>
+          </div>
+          <div class="action-bar">
+            <ul>
+              <li>
+                <a href="#"><img src="static/dist/images/pet-small.png" class="img-circle" alt="Generic placeholder image" height="30" width="30"></a>
+              </li>
+              <li>
+                <a href="#" class="btn-add-pet"><span class="glyphicon glyphicon-plus"></span></a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- /row -->
+    <div class="row">
+      <div class="col-md-4 col-md-offset-4">
+        <p><a class="btn btn-default btn-block" href="/owners">See All Owners</a></p>
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/src/main/webapp/components/landing/_pets.html b/src/main/webapp/components/landing/_pets.html
new file mode 100644
index 000000000..a3dc49561
--- /dev/null
+++ b/src/main/webapp/components/landing/_pets.html
@@ -0,0 +1,53 @@
+<section id="pets" class="sections sections-narrow">
+  <div class="container">
+    <h2 class="sub-header">Pets</h2>
+    <div class="row thumbnail-wrapper">
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/pet-default.png" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Basil</h3>
+            <p class="caption-meta">08 August 2012</p>
+            <p class="caption-meta"><span class="caption-label">Hamster</span></p>
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/pet-default.png" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Basil</h3>
+            <p class="caption-meta">08 August 2012</p>
+            <p class="caption-meta"><span class="caption-label">Hamster</span></p>
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/pet-default.png" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Basil</h3>
+            <p class="caption-meta">08 August 2012</p>
+            <p class="caption-meta"><span class="caption-label">Hamster</span></p>
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/pet-default.png" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Basil</h3>
+            <p class="caption-meta">08 August 2012</p>
+            <p class="caption-meta"><span class="caption-label">Hamster</span></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- /row -->
+    <div class="row">
+      <div class="col-md-4 col-md-offset-4">
+        <p><a class="btn btn-default btn-block" href="/pets">See All Pets</a></p>
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/src/main/webapp/components/landing/_vets.html b/src/main/webapp/components/landing/_vets.html
new file mode 100644
index 000000000..69c3411b8
--- /dev/null
+++ b/src/main/webapp/components/landing/_vets.html
@@ -0,0 +1,53 @@
+<section id="owners" class="sections">
+  <div class="container">
+    <h2 class="sub-header">Veterinarians</h2>
+    <div class="row thumbnail-wrapper">
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/veterinarian-default.jpg" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Helen Leary</h3>
+            <p class="caption-meta"><span class="glyphicon glyphicon-phone-alt"></span> +6085558763</p>
+            <p class="caption-meta"><span class="caption-label">Surgery</span></p>
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/veterinarian-default.jpg" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Helen Leary</h3>
+            <p class="caption-meta"><span class="glyphicon glyphicon-phone-alt"></span> +6085558763</p>
+            <p class="caption-meta"><span class="caption-label">Surgery</span></p>
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/veterinarian-default.jpg" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Helen Leary</h3>
+            <p class="caption-meta"><span class="glyphicon glyphicon-phone-alt"></span> +6085558763</p>
+            <p class="caption-meta"><span class="caption-label">Surgery</span></p>
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="thumbnail">
+          <img src="static/dist/images/veterinarian-default.jpg" class="img-circle" alt="Generic placeholder image">
+          <div class="caption">
+            <h3 class="caption-heading">Helen Leary</h3>
+            <p class="caption-meta"><span class="glyphicon glyphicon-phone-alt"></span> +6085558763</p>
+            <p class="caption-meta"><span class="caption-label">Surgery</span></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- /row -->
+    <div class="row">
+      <div class="col-md-4 col-md-offset-4">
+        <p><a class="btn btn-default btn-block" href="/vets">See All Veterinarians</a></p>
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/src/main/webapp/components/landing/_welcome.html b/src/main/webapp/components/landing/_welcome.html
new file mode 100644
index 000000000..5b437c44b
--- /dev/null
+++ b/src/main/webapp/components/landing/_welcome.html
@@ -0,0 +1,14 @@
+<!-- Welcome -->
+<header class="sections sections-narrow sections-light">
+  <div class="container">
+    <div class="media media-welcome">
+      <div class="media-left">
+        <img src="static/dist/images/avatar.jpg" class="img-circle media-object" width="90" height="90">
+      </div>
+      <div class="media-body">
+        <h4 class="h3">Welcome, John Doe</h4>
+        <p>When you’re ready, you may start adding a new <a href="#">pet owner</a> or <a href="#">continue browsing</a>.</p>
+      </div>
+    </div>
+  </div>
+</header>
diff --git a/src/main/webapp/components/landing/landing.html b/src/main/webapp/components/landing/landing.html
index 3101e4542..2395c2987 100644
--- a/src/main/webapp/components/landing/landing.html
+++ b/src/main/webapp/components/landing/landing.html
@@ -1,26 +1,11 @@
-<!-- Main jumbotron for a primary marketing message or call to action -->
-<div class="jumbotron">
-  <div class="container">
-    <div class="jumbotron-headline">
-      <div class="jumbotron-headline-cell">
-        <h1>Pet Clinic <br> A Spring Framework Demonstration</h1>
-        <p>A place to see your neighborhood pet owners</p>
-        <p><a class="btn btn-primary btn-lg" data-ui-sref="home.owners" role="button">Get started - It's Free!</a></p>
-      </div>
-    </div>
-  </div>
-</div>
+<!-- Welcome -->
+<data-ng-include src="'components/landing/_welcome.html'"></data-ng-include>
 
-<data-ng-include src="'components/landing/_services.html'"></data-ng-include>
+<!-- Owners -->
+<data-ng-include src="'components/landing/_owners.html'"></data-ng-include>
 
-<!-- Testimonials -->
-<data-ng-include src="'components/landing/_testimonials.html'"></data-ng-include>
+<!-- Pets -->
+<data-ng-include src="'components/landing/_pets.html'"></data-ng-include>
 
-<!-- Companies -->
-<data-ng-include src="'components/landing/_companies.html'"></data-ng-include>
-
-<!-- Make an appointment call to action -->
-<data-ng-include src="'components/landing/_appointment.html'"></data-ng-include>
-
-<!-- Add Owner / Register -->
-<data-ng-include src="'components/landing/_add_owner.html'"></data-ng-include>
\ No newline at end of file
+<!-- Vets -->
+<data-ng-include src="'components/landing/_vets.html'"></data-ng-include>