diff --git a/.gitignore b/.gitignore
index 291003c8f..abc749bf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ assets/stylesheets/
 assets/components/
 assets/javascript/vendor/
 assets/javascript/foundation.js
+assets/javascript/custom/demosite.js
diff --git a/assets/images/demo/fpmock.png b/assets/images/demo/fpmock.png
new file mode 100644
index 000000000..03c702eb2
Binary files /dev/null and b/assets/images/demo/fpmock.png differ
diff --git a/assets/scss/site/_front.scss b/assets/scss/site/_front.scss
index d8564df84..09a2c5ea0 100755
--- a/assets/scss/site/_front.scss
+++ b/assets/scss/site/_front.scss
@@ -1,20 +1,92 @@
 #front-hero {
-	background: url("../images/demo/marquee-stars.svg") repeat scroll 0 0 #074E68;
-	padding: rem-calc(20) 0;
-	margin: - rem-calc(32) 0 rem-calc(32);
-	position: relative;
-	text-align: left;
-	height: auto;
+
+	.marketing {
+		@include grid-row();
+	}
+
+	@media #{$small-up} {
+		background: url("../images/demo/marquee-stars.svg") repeat scroll 0 0 #074E68;
+		padding: rem-calc(65%) 0;
+		margin: - rem-calc(32) 0 rem-calc(32);
+		position: relative;
+		text-align: left;
+	}
+
+	@media #{$medium-up} {
+		height: rem-calc(400);
+		margin: - rem-calc(32) 0 rem-calc(72);
+	}
+
+	#watch {
+		section {
+			display: inline;
+		}
+
+		a {
+			color: #B4C9D1;
+			cursor: pointer;
+			font-weight: 400;
+			margin-right: rem-calc(20);
+		}
+
+		a:hover {
+			color: #fff;
+		}
+
+		#stargazers {
+			:before {
+				content: "\f09b";
+				font-family: FontAwesome;
+				font-style: normal;
+				font-weight: normal;
+				text-decoration: inherit;
+				color: #B4C9D1;
+				margin-right: rem-calc(8);
+			}
+		}
+
+		#twitter {
+			:before {
+				content: "\f099";
+				font-family: FontAwesome;
+				font-style: normal;
+				font-weight: normal;
+				text-decoration: inherit;
+				color: #B4C9D1;
+				margin-right: rem-calc(8);
+			}
+		}
+
+	}
+
+	.tagline {
+
+		@media screen and (min-width: 320px) and (max-width: 640px) {
+			@include grid-column(12);
+		}
+
+		@media screen and (min-width:641px) and (max-width: 870px) {
+			@include grid-column(9);
+		}
+
+		@media screen and (min-width: 871px) {
+			@include grid-column(5);
+		}
+	}
 
 		h1 { font-weight: 500; }
 
 		h1 a, h4 { color: #fff; }
 
-		.floatingyeti img {
-			max-width: 30%;
+		.fpmock img {
+			@media screen and (max-width: 870px) {
+				display: none;
+			}
+
 			position: absolute;
-			right: rem-calc(100);
+			top:rem-calc(21);
 		}
 
 		.download { margin-top: rem-calc(20); }
+
 	}
diff --git a/templates/front.php b/templates/front.php
index 04ca976e0..6351b39eb 100755
--- a/templates/front.php
+++ b/templates/front.php
@@ -5,18 +5,25 @@
 get_header(); ?>
 
 <header id="front-hero" role="banner">
-	<div class="row">
-		<div class="small-12 medium-7 columns">
+	<div class="marketing">
+		<div class="tagline">
 			<h1><a href="<?php bloginfo( 'url' ); ?>" title="<?php bloginfo( 'name' ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
 			<h4 class="subheader"><?php bloginfo( 'description' ); ?></h4>
+			<a role="button" class="download large button show-for-medium-up" href="https://github.com/olefredrik/foundationpress">Download FoundationPress</a>
 		</div>
 
-		<div class="medium-6 columns end">
-			<a role="button" class="download large button hide-for-small" href="https://github.com/olefredrik/foundationpress">Download FoundationPress</a>
+		<div id="watch" class="small-12 columns">
+			<section id="stargazers">
+				<a href="https://github.com/olefredrik/foundationpress">1.5k stargazers</a>
+			</section>
+			<section id="twitter">
+				<a href="https://twitter.com/olefredrik">@olefredrik</a>
+			</section>
 		</div>
 
-		<div class="floatingyeti show-for-medium-up">
-			<img data-cfsrc="<?php echo get_stylesheet_directory_uri(); ?>/assets/images/demo/hero-image.svg" alt="Foundation Yeti" src="<?php echo get_stylesheet_directory_uri(); ?>/assets/images/demo/hero-image.svg">
+
+		<div class="fpmock">
+			<img data-interchange="[<?php echo get_stylesheet_directory_uri(); ?>/assets/images/demo/fpmock.png, (default)]" alt="FoundationPress - the ultimate WordPress starter theme">
 		</div>
 	</div>