diff --git a/include/views/default/crunchbutton/frontend/account.phtml b/include/views/default/crunchbutton/frontend/account.phtml
index 2f1a4c3eb..0ba332c9c 100644
--- a/include/views/default/crunchbutton/frontend/account.phtml
+++ b/include/views/default/crunchbutton/frontend/account.phtml
@@ -8,7 +8,7 @@
 	<div ng-controller="AccountSignInCtrl" ng-show="modal.signin">
 		<div ng-show="!help.visible">
 			<form name="formSignin" ng-submit="account.signin()">
-				<input type="text" maxlength="250" name="email" class="signin-email" ng-enter="account.signin()" validate-login required placeholder="email or phone" tabindex="10" ng-model="account.form.email" />
+				<input type="email" maxlength="250" name="email" class="signin-email" ng-enter="account.signin()" validate-login required placeholder="email or phone" tabindex="10" ng-model="account.form.email" />
 				<div class="divider"></div>
 				<input type="password" maxlength="250" name="password" class="signin-password" ng-enter="account.signin()" required placeholder="password" tabindex="10" ng-model="account.form.password" />
 				<div class="divider"></div>
diff --git a/include/views/default/crunchbutton/layout/html.facebook.phtml b/include/views/default/crunchbutton/layout/html.facebook.phtml
new file mode 100644
index 000000000..f812182bd
--- /dev/null
+++ b/include/views/default/crunchbutton/layout/html.facebook.phtml
@@ -0,0 +1,36 @@
+
+<? if (strpos($_SERVER['HTTP_USER_AGENT'],'facebookexternalhit') !== false) : ?>
+	
+	<? if ($this->restaurant->id_restaurant) : ?>
+		<meta property="og:title" content="<?=$this->restaurant->name?> on Crunchbutton">
+		<meta property="og:description" content="One click food ordering from <?=$this->restaurant->name?>. We find the best restaurants <?=$this->community->prep?> <?=$this->community->name?> and make ordering your favorite dishes as easy as one click.">
+		<? if ($this->restaurant->image()) : ?>
+			<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/cache/images/<?=$this->restaurant->facebook()->getFileName()?>">
+		<? else : ?>
+			<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/assets/images/share.jpg">
+		<? endif ; ?>
+
+	<? elseif ($this->community->id_community) : ?>
+		<meta property="og:title" content="Crunchbutton - One click food ordering from <?=$this->community->name?>">
+		<meta property="og:description" content="We feature the top restaurants <?=$this->community->prep?> <?=$this->community->name?>. Order your favorite dishes with a click of one button from your computer or phone.">
+		<? foreach ($this->community->restaurants() as $restaurant) : ?>
+			<? if ($restaurant->image()) : ?>
+				<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/cache/images/<?=$restaurant->facebook()->getFileName()?>">
+			<? else : ?>
+				<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/assets/images/share.jpg">
+			<? endif ; ?>
+
+			<? break;?>
+		<? endforeach; ?>
+
+	<? else : ?>
+		<meta property="og:title" content="Crunchbutton - One click food ordering">
+		<meta property="og:description" content="We feature the top restaurants in your neighborhood. Order your favorite dishes with a click of one button from your computer or phone.">
+		<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/assets/images/share.jpg">
+	<? endif ; ?>
+
+	<meta property="og:type" content="company">
+	<meta property="og:url" content="https://<?=$_SERVER['HTTP_HOST']?><?=$_SERVER['REQUEST_URI']?>">
+	<meta property="og:site_name" content="Crunchbutton">
+	<meta property="fb:app_id" content="***REMOVED***">
+<? endif ; ?>
diff --git a/include/views/default/crunchbutton/layout/html.servertime.phtml b/include/views/default/crunchbutton/layout/html.servertime.phtml
new file mode 100644
index 000000000..8d73241e7
--- /dev/null
+++ b/include/views/default/crunchbutton/layout/html.servertime.phtml
@@ -0,0 +1,8 @@
+<script type="text/javascript">
+<?
+	// Get server's date time converted to GMD
+	$utc_str = gmdate( 'Y/n/d/H/i/s', time() );
+	$utc = strtotime( $utc_str );
+?>
+var _gmtServer = '<?=$utc_str?>';
+</script>
\ No newline at end of file
diff --git a/include/views/default/crunchbutton/layout/html.templates.phtml b/include/views/default/crunchbutton/layout/html.templates.phtml
new file mode 100644
index 000000000..be93d9c22
--- /dev/null
+++ b/include/views/default/crunchbutton/layout/html.templates.phtml
@@ -0,0 +1,7 @@
+<? foreach (new DirectoryIterator(c::config()->dirs->view.'default/crunchbutton/frontend') as $fileInfo) : ?>
+	<? if (!$fileInfo->isDot() && $fileInfo->getBasename() != '.DS_Store' ) : ?>
+		<script type="text/ng-template" id="assets/view/<?=$fileInfo->getBasename('.phtml')?>.html">
+			<?=$this->render('frontend/'.$fileInfo->getBasename('.phtml'), ['filter' => false])?>
+		</script>
+	<? endif ; ?>
+<? endforeach; ?>
\ No newline at end of file
diff --git a/include/views/default/crunchbutton/layout/html.top.phtml b/include/views/default/crunchbutton/layout/html.top.phtml
index 6bb805598..91985cc61 100644
--- a/include/views/default/crunchbutton/layout/html.top.phtml
+++ b/include/views/default/crunchbutton/layout/html.top.phtml
@@ -1,8 +1,7 @@
 <!doctype html>
-<html><?/*  data-ng-app="NGApp" */?>
+<html lang="en">
 <head>
 <title><?=$this->title ? $this->title : 'Crunchbutton'?></title>
-<? /* <meta name="viewport" content="user-scalable=no, initial-scale = 1.0,maximum-scale = 1.0"> */ ?>
 <meta name="fragment" content="!" />
 <meta name="viewport" content="initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0" />
 <meta name="format-detection" content="telephone=no">
@@ -12,14 +11,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="apple-mobile-web-app-status-bar-style" content="black">
 <link rel="apple-touch-icon-precomposed" href="/assets/images/appicon.png">
-<script type="text/javascript">
-<?
-	// Get server's date time converted to GMD
-	$utc_str = gmdate( 'Y/n/d/H/i/s', time() );
-	$utc = strtotime( $utc_str );
-?>
-var _gmtServer = '<?=$utc_str?>';
-</script>
+<?=$this->display('layout/html.servertime')?>
 
 <? if (c::config()->bundle) : ?>
 	<link rel="stylesheet" type="text/css" href="/assets/css/bundle.css?v=<?=Cana_Util::gitVersion()?>&s=style">
@@ -30,60 +22,8 @@ var _gmtServer = '<?=$utc_str?>';
 
 <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,300,700" rel="stylesheet" type="text/css">
 
-<? /*
-<link href="/assets/images/startup-320x460.png" media="(-webkit-device-pixel-ratio: 1)" rel="apple-touch-startup-image">
-<link href="/assets/images/startup-640x920.png" media="(device-width: 320px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image">
-<link href="/assets/images/startup-640x1096.png" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image">
-*/ ?>
-
 <script type="text/javascript" src="https://www.google.com/jsapi"></script>
 
-<? /* TEMPLATES */ ?>
-
-<? foreach (new DirectoryIterator(c::config()->dirs->view.'default/crunchbutton/frontend') as $fileInfo) : ?>
-	<? if (!$fileInfo->isDot() && $fileInfo->getBasename() != '.DS_Store' ) : ?>
-		<script type="text/ng-template" id="assets/view/<?=$fileInfo->getBasename('.phtml')?>.html">
-			<?=$this->render('frontend/'.$fileInfo->getBasename('.phtml'), ['filter' => false])?>
-		</script>
-	<? endif ; ?>
-<? endforeach; ?>
-
-<? /* END TEMPLATES */ ?>
-
-
-<? if (strpos($_SERVER['HTTP_USER_AGENT'],'facebookexternalhit') !== false) : ?>
-	
-	<? if ($this->restaurant->id_restaurant) : ?>
-		<meta property="og:title" content="<?=$this->restaurant->name?> on Crunchbutton">
-		<meta property="og:description" content="One click food ordering from <?=$this->restaurant->name?>. We find the best restaurants <?=$this->community->prep?> <?=$this->community->name?> and make ordering your favorite dishes as easy as one click.">
-		<? if ($this->restaurant->image()) : ?>
-			<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/cache/images/<?=$this->restaurant->facebook()->getFileName()?>">
-		<? else : ?>
-			<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/assets/images/share.jpg">
-		<? endif ; ?>
-
-	<? elseif ($this->community->id_community) : ?>
-		<meta property="og:title" content="Crunchbutton - One click food ordering from <?=$this->community->name?>">
-		<meta property="og:description" content="We feature the top restaurants <?=$this->community->prep?> <?=$this->community->name?>. Order your favorite dishes with a click of one button from your computer or phone.">
-		<? foreach ($this->community->restaurants() as $restaurant) : ?>
-			<? if ($restaurant->image()) : ?>
-				<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/cache/images/<?=$restaurant->facebook()->getFileName()?>">
-			<? else : ?>
-				<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/assets/images/share.jpg">
-			<? endif ; ?>
-
-			<? break;?>
-		<? endforeach; ?>
-
-	<? else : ?>
-		<meta property="og:title" content="Crunchbutton - One click food ordering">
-		<meta property="og:description" content="We feature the top restaurants in your neighborhood. Order your favorite dishes with a click of one button from your computer or phone.">
-		<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/assets/images/share.jpg">
-	<? endif ; ?>
-
-	<meta property="og:type" content="company">
-	<meta property="og:url" content="https://<?=$_SERVER['HTTP_HOST']?><?=$_SERVER['REQUEST_URI']?>">
-	<meta property="og:site_name" content="Crunchbutton">
-	<meta property="fb:app_id" content="***REMOVED***">
-<? endif ; ?>
+<?=$this->display('layout/html.templates')?>
 
+<?=$this->display('layout/html.facebook')?>
diff --git a/include/views/default/seven/frontend/location.phtml b/include/views/default/seven/frontend/location.phtml
index b1a2c9814..d6e04a0d8 100644
--- a/include/views/default/seven/frontend/location.phtml
+++ b/include/views/default/seven/frontend/location.phtml
@@ -1,26 +1,19 @@
 <div class="home-top">
-	<div id="dropdown-menu" class="dropdown dropdown-tip">
-		<ul class="dropdown-menu">
-			<li><a href="/restaurants">Restaurants</a></li>
-			<li><a href="/orders">Previous Orders</a></li>
-			<li><a href="/location">Change Location</a></li>
-			<li class="dropdown-divider"></li>
-			<li><a href="/help">FAQ</a></li>
-			<li><a href="/logout">Log Out</a></li>
-	    </ul>
-	</div>
 
-	<div class="menu" data-dropdown="#dropdown-menu"></div>
-	<div class="logo"></div>
 	<div class="pushabutton"></div>
 	<div class="home-inputs">
 		<table cellpadding="0" cellspacing="0" class="home-location">
 			<tr>
-				<td style="width: 100%;"><input class="enter-location" placeholder="Enter your location" ng-model="location.form.address"></td>
-				<td><button class="find-location" ng-click="locEat()"><span class="icon icon-location-arrow "></span></button></td>
+				<td style="width: 100%;"><input class="enter-location" placeholder="Enter your location" ng-enter="letsEat()" ng-model="location.form.address"></td>
+				<td>				
+					<button class="location-detect ladda-button" ng-spinner data-style="zoom-out" data-spinner-color="#FFFFFF" ng-click="locEat()">
+						<span class="icon icon-location-arrow "></span>
+						<div class="ladda-spinner"></div>
+					</button>
+				</td>
 			</tr>
 		</table>
-		<button class="button pushable orange find-restaurants ladda-button" ng-click="letsEat()" ng-spinner data-style="zoom-out" data-spinner-color="#FFFFFF">
+		<button class="button pushable orange find-restaurants button-letseat-form ladda-button" ng-click="letsEat()" ng-spinner data-style="zoom-out" data-spinner-color="#FFFFFF">
 			<div class="ladda-label">Find Restaurants!</div>
 			<span class="ladda-spinner"></span>
 		</button>
diff --git a/include/views/default/seven/layout/html.body.phtml b/include/views/default/seven/layout/html.body.phtml
new file mode 100644
index 000000000..f1bedf14f
--- /dev/null
+++ b/include/views/default/seven/layout/html.body.phtml
@@ -0,0 +1,186 @@
+
+<div class="snap-drawers" ng-controller="SideMenuCtrl">
+	<div class="snap-drawer snap-drawer-left">
+		<div>
+			<div class="pushabutton-getfood"></div>
+			<ul>
+				<li ng-instant="navigation.link('/food-delivery')">
+					<table cellpadding="0" cellspacing="0" class="side-menu-wrap">
+						<tr>
+							<td class="side-menu-icon"><i class="icon-food"></i></td>
+							<td class="side-menu-label">Restaurants</a></td>
+						</tr>
+					</table>
+				</li>
+				<li ng-show="account.user.id_user" ng-instant="navigation.link('/orders')">
+					<table cellpadding="0" cellspacing="0" class="side-menu-wrap">
+						<tr>
+							<td class="side-menu-icon"><i class="icon-time"></i></td>
+							<td class="side-menu-label">Previous Orders</a></td>
+						</tr>
+					</table>
+				</li>
+				<li ng-instant="navigation.link('/location')">
+					<table cellpadding="0" cellspacing="0" class="side-menu-wrap">
+						<tr>
+							<td class="side-menu-icon"><i class="icon-map-marker" style="margin-left: 3px;"></i></td>
+							<td class="side-menu-label">Change Location</a></td>
+						</tr>
+					</table>
+				</li>
+				<li ng-instant="navigation.link('/help')">
+					<table cellpadding="0" cellspacing="0" class="side-menu-wrap">
+						<tr>
+							<td class="side-menu-icon"><i class="icon-question-sign"></i></td>
+							<td class="side-menu-label">FAQ</a></td>
+						</tr>
+					</table>
+				</li>
+				<li ng-show="!account.user.id_user" ng-instant="navigation.signin()">
+					<table cellpadding="0" cellspacing="0" class="side-menu-wrap">
+						<tr>
+							<td class="side-menu-icon"><i class="icon-user"></i></td>
+							<td class="side-menu-label">Log In</a></td>
+						</tr>
+					</table>
+				</li>
+				<li ng-show="account.user.id_user" ng-instant="signout.do()">
+					<table cellpadding="0" cellspacing="0" class="side-menu-wrap">
+						<tr>
+							<td class="side-menu-icon"><i class="icon-mail-reply"></i></td>
+							<td class="side-menu-label">Logout</a></td>
+						</tr>
+					</table>
+				</li>
+
+				<li ng-instant="test.card()" ng-show="account.user.debug">
+					<table cellpadding="0" cellspacing="0" class="side-menu-wrap">
+						<tr>
+							<td class="side-menu-icon"><i class="icon-circle-blank"></i></td>
+							<td class="side-menu-label">TEST: card</a></td>
+						</tr>
+					</table>
+				</li>
+				<li ng-instant="test.clearloc()" ng-show="account.user.debug">
+					<table cellpadding="0" cellspacing="0" class="side-menu-wrap">
+						<tr>
+							<td class="side-menu-icon"><i class="icon-circle-blank"></i></td>
+							<td class="side-menu-label">TEST: clear loc</a></td>
+						</tr>
+					</table>
+				</li>
+				<li ng-instant="test.reload()" ng-show="account.user.debug">
+					<table cellpadding="0" cellspacing="0" class="side-menu-wrap">
+						<tr>
+							<td class="side-menu-icon"><i class="icon-circle-blank"></i></td>
+							<td class="side-menu-label">TEST: reload page</a></td>
+						</tr>
+					</table>
+				</li>
+			</ul>
+			<div>
+				<p>&copy; <?=date('Y')?> YouBeo. All rights reserved.</p>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="wrapper">
+	
+	<div id="snap-content" class="snap-content">
+		<div class="navs" data-position="fixed" ng-controller="MainHeaderCtrl">
+			<div class="nav nav-top">
+				<div class="content">
+
+
+				
+					<div id="dropdown-menu" class="dropdown dropdown-tip">
+						<ul class="dropdown-menu">
+							<li><a ng-click="navigation.link('/food-delivery')">Restaurants</a></li>
+							<li><a ng-click="navigation.link('/orders')" ng-show="account.user.id_user">Previous Orders</a></li>
+							<li><a ng-click="navigation.link('/location')">Change Location</a></li>
+							<li class="dropdown-divider"></li>
+							<li><a ng-click="navigation.link('/help')">FAQ</a></li>
+							<li><a ng-click="navigation.signin()" ng-show="!account.user.id_user">Log In</a></li>
+							<li><a ng-click="signout.do()" ng-show="account.user.id_user">Log Out</a></li>
+					    </ul>
+					</div>
+				
+					<div class="menu side" ng-click="navigation.menu()"></div>
+					<div class="menu drop" data-dropdown="#dropdown-menu"></div>
+
+					<div class="logo" ng-click="navigation.home()"></div>
+
+					<div title="Back" ng-show="navigation.buttons.back" class="nav-back" ng-instant="back()"></div>
+	
+				</div>
+			</div>
+			<div class="nav nav-cart" ng-click="cartScroll()">
+				<div class="cart-summary cart-summary-detail">
+					<div class="cart-summary-icon"></div>
+					<div class="cart-summary-item-count"><span>{{order.info.totalItems}}</span></div>
+					<div class="cart-summary-items">{{order.info.cartSummary}}</div>
+				</div>
+			</div>
+		</div>
+
+
+		<div ng-class="{'button-bottom-show': (navigation.page == 'restaurant' && navigation.restaurant._open && navigation.order.cart.hasItems() && !notificationBarStatus ), 'button-bottom-show-notification-bar-on': (navigation.page == 'restaurant' && navigation.restaurant._open && navigation.order.cart.hasItems() && notificationBarStatus )}" class="button-bottom-wrapper">
+			<button class="button pushable orange get-food" ng-click="navigation.order.submit();"><div>Get Food</div></button>
+		</div>
+
+		<div class="snap-content-inner bg" ng-scroll-position>
+			<div class="body">
+				<div class="content<?=$e?>">
+					<div class="main-content pages">
+						<div ng-view><?=$this->content?></div>
+					</div>
+				</div>
+			</div>
+
+			<div class="divider"></div>
+
+			<div class="footer">
+
+				<? if (!$this->export) : ?>
+					<div class="fb-like-mobile fb-like-box" data-href="http://www.facebook.com/crunchbutton" data-width="300" data-show-faces="false" data-stream="false" data-header="false"></div>
+				<? endif ; ?>
+
+				<div class="footer-content hidden-phone" ng-controller="MainHeaderCtrl">
+	
+					<a href="javascript:;" ng-click="navigation.link('/help')">Help</a>
+					<a ng-show="navigation.account.user" href="javascript:;" ng-click="navigation.link('/orders')">Order History</a>
+
+					<a href="javascript:App.test.card();" class="test-card" ng-show="account.user.debug">TEST: card</a>
+					<a href="javascript:App.test.logout();" class="test-logout" ng-show="account.user.debug">TEST: logout</a>
+					<a href="javascript:App.test.clearloc();" class="test-clearloc" ng-show="account.user.debug">TEST: clear loc</a>
+					<a href="javascript:;" ng-click="navigation.link('/')" ng-show="account.user.debug">TEST: go home</a>
+					<a href="javascript:;" ng-click="navigation.link('/location')" ng-show="account.user.debug">TEST: go location</a>
+
+					<br />
+					<span class="copyright">&copy; <?=date('Y')?> YouBeo. All rights reserved.</span>
+				</div>
+			</div>
+
+		</div>
+
+
+	</div>
+
+	<div class="divider"></div>
+</div>
+
+<div ng-include="'assets/view/notification.alert.html'"></div>
+<div ng-include="'assets/view/restaurant.closed.html'"></div>
+<div ng-include="'assets/view/restaurant.suggestion.tooltip.html'"></div>
+<div ng-include="'assets/view/account.html'"></div>
+<div ng-include="'assets/view/account.reset.html'"></div>
+<div ng-include="'assets/view/account.facebook.html'"></div>
+<div ng-include="'assets/view/restaurant.closed.inline.html'"></div>
+<div ng-include="'assets/view/giftcard.html'"></div>
+<div ng-include="'assets/view/suggestion.html'"></div>
+<div ng-include="'assets/view/support.html'"></div>
+<div ng-include="'assets/view/connection.error.html'"></div>
+
+<div id="fb-root"></div>
+
diff --git a/include/views/default/seven/layout/html.phtml b/include/views/default/seven/layout/html.phtml
new file mode 100644
index 000000000..e238d2538
--- /dev/null
+++ b/include/views/default/seven/layout/html.phtml
@@ -0,0 +1,15 @@
+<?=$this->display('layout/html.top')?>
+
+<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.8/angular.min.js"></script>
+<script src="//js.balancedpayments.com/v1/balanced.js"></script>
+<script src="/assets/js/jquery.autosize-min.js?v=<?=Cana_Util::gitVersion()?>"></script>
+<script src="/assets/js/jquery.dropdown-min.js?v=<?=Cana_Util::gitVersion()?>"></script>
+
+<? if (c::config()->bundle) : ?>
+	<script src="/assets/js/bundle.js?v=<?=Cana_Util::gitVersion()?>&s=app"></script>
+<? else : ?>
+	<?=$this->display('bundle/js', ['set' => ['scripts' => ['app']]])?>
+<? endif ; ?>
+
+<?=$this->display('layout/html.bottom')?>
\ No newline at end of file
diff --git a/include/views/default/seven/layout/html.top.phtml b/include/views/default/seven/layout/html.top.phtml
index 91601fe3e..7a688e703 100644
--- a/include/views/default/seven/layout/html.top.phtml
+++ b/include/views/default/seven/layout/html.top.phtml
@@ -1,8 +1,7 @@
 <!doctype html>
-<html><?/*  data-ng-app="NGApp" */?>
+<html lang="en">
 <head>
 <title><?=$this->title ? $this->title : 'Crunchbutton'?></title>
-<? /* <meta name="viewport" content="user-scalable=no, initial-scale = 1.0,maximum-scale = 1.0"> */ ?>
 <meta name="fragment" content="!" />
 <meta name="viewport" content="initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0" />
 <meta name="format-detection" content="telephone=no">
@@ -12,84 +11,19 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="apple-mobile-web-app-status-bar-style" content="black">
 <link rel="apple-touch-icon-precomposed" href="/assets/images/appicon.png">
-<script type="text/javascript">
-<?
-	// Get server's date time converted to GMD
-	$utc_str = gmdate( 'Y/n/d/H/i/s', time() );
-	$utc = strtotime( $utc_str );
-?>
-var _gmtServer = '<?=$utc_str?>';
-</script>
+<?=$this->display('layout/html.servertime')?>
+
 <? if (c::config()->bundle) : ?>
-	<link rel="stylesheet" type="text/css" href="/assets/css/bundle.css?v=<?=Cana_Util::gitVersion()?>">
+	<link rel="stylesheet" type="text/css" href="/assets/css/bundle.css?v=<?=Cana_Util::gitVersion()?>&s=seven">
 <? else : ?>
-	<link rel="stylesheet" type="text/css" href="/assets/css/seven.css?v=<?=Cana_Util::gitVersion()?>">
-	<link rel="stylesheet" type="text/css" href="/assets/css/font-awesome.css?v=<?=Cana_Util::gitVersion()?>">
-	<link rel="stylesheet" type="text/css" href="/assets/css/magnific-popup.css?v=<?=Cana_Util::gitVersion()?>">
-	<link rel="stylesheet" type="text/css" href="/assets/css/ladda-themeless.min.css?v=<?=Cana_Util::gitVersion()?>">
-	<? /* <link rel="stylesheet" type="text/css" href="/assets/css/icheck.red.css?v=<?=Cana_Util::gitVersion()?>"> */ ?>
-	<? if (strpos($_SERVER['HTTP_USER_AGENT'],'Windows') !== false) : ?>
-		<link rel="stylesheet" type="text/css" href="/assets/css/windows.css?v=<?=Cana_Util::gitVersion()?>">
-	<? endif ; ?>
+	<?=$this->display('bundle/css', ['set' => ['style' => ['seven']]])?>
 <? endif ; ?>
 <link rel="shortcut icon" href="/favicon.ico">
 
 <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,300,700" rel="stylesheet" type="text/css">
 
-<? /*
-<link href="/assets/images/startup-320x460.png" media="(-webkit-device-pixel-ratio: 1)" rel="apple-touch-startup-image">
-<link href="/assets/images/startup-640x920.png" media="(device-width: 320px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image">
-<link href="/assets/images/startup-640x1096.png" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image">
-*/ ?>
-
 <script type="text/javascript" src="https://www.google.com/jsapi"></script>
 
-<? /* TEMPLATES */ ?>
-
-<? foreach (new DirectoryIterator(c::config()->dirs->view.'default/crunchbutton/frontend') as $fileInfo) : ?>
-	<? if (!$fileInfo->isDot() && $fileInfo->getBasename() != '.DS_Store' ) : ?>
-		<script type="text/ng-template" id="assets/view/<?=$fileInfo->getBasename('.phtml')?>.html">
-			<?=$this->render('frontend/'.$fileInfo->getBasename('.phtml'), ['filter' => false])?>
-		</script>
-	<? endif ; ?>
-<? endforeach; ?>
-
-<? /* END TEMPLATES */ ?>
-
-
-<? if (strpos($_SERVER['HTTP_USER_AGENT'],'facebookexternalhit') !== false) : ?>
-	
-	<? if ($this->restaurant->id_restaurant) : ?>
-		<meta property="og:title" content="<?=$this->restaurant->name?> on Crunchbutton">
-		<meta property="og:description" content="One click food ordering from <?=$this->restaurant->name?>. We find the best restaurants <?=$this->community->prep?> <?=$this->community->name?> and make ordering your favorite dishes as easy as one click.">
-		<? if ($this->restaurant->image()) : ?>
-			<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/cache/images/<?=$this->restaurant->facebook()->getFileName()?>">
-		<? else : ?>
-			<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/assets/images/share.jpg">
-		<? endif ; ?>
-
-	<? elseif ($this->community->id_community) : ?>
-		<meta property="og:title" content="Crunchbutton - One click food ordering from <?=$this->community->name?>">
-		<meta property="og:description" content="We feature the top restaurants <?=$this->community->prep?> <?=$this->community->name?>. Order your favorite dishes with a click of one button from your computer or phone.">
-		<? foreach ($this->community->restaurants() as $restaurant) : ?>
-			<? if ($restaurant->image()) : ?>
-				<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/cache/images/<?=$restaurant->facebook()->getFileName()?>">
-			<? else : ?>
-				<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/assets/images/share.jpg">
-			<? endif ; ?>
-
-			<? break;?>
-		<? endforeach; ?>
-
-	<? else : ?>
-		<meta property="og:title" content="Crunchbutton - One click food ordering">
-		<meta property="og:description" content="We feature the top restaurants in your neighborhood. Order your favorite dishes with a click of one button from your computer or phone.">
-		<meta property="og:image" content="http://<?=$_SERVER['HTTP_HOST']?>/assets/images/share.jpg">
-	<? endif ; ?>
-
-	<meta property="og:type" content="company">
-	<meta property="og:url" content="https://<?=$_SERVER['HTTP_HOST']?><?=$_SERVER['REQUEST_URI']?>">
-	<meta property="og:site_name" content="Crunchbutton">
-	<meta property="fb:app_id" content="***REMOVED***">
-<? endif ; ?>
+<?=$this->display('layout/html.templates')?>
 
+<?=$this->display('layout/html.facebook')?>
diff --git a/www/assets/css/seven.css b/www/assets/css/seven.css
index 618b4265c..2914d21be 100644
--- a/www/assets/css/seven.css
+++ b/www/assets/css/seven.css
@@ -104,12 +104,11 @@ html {
 
 .logo {
 	background: url(/assets/images/micro/crunchbutton-logo.svg) no-repeat;
-	background-position: center center;
+	background-position: top center;
 	width: 254px;
 	height: 50px;
 	background-size: 100%;
 	margin: 0 auto;
-	padding-top: 40px;
 	-webkit-transition: all 0.2s;
 }
 
@@ -121,7 +120,7 @@ html {
 	height: 28px;
 	background-size: 100%;
 	float: left;
-	margin: 31px 0 0 25px;
+	margin: 8px 0 0 25px;
 	-webkit-transition: all 0.2s;
 	cursor: pointer;
 }
@@ -172,7 +171,7 @@ html {
 	width: 100%;
 	height: 20px;
 }
-.find-location {
+.location-detect {
 	background: #00bd9e;
 	border-top-right-radius:6px;
 	border-bottom-right-radius:6px;
@@ -191,7 +190,7 @@ html {
 	-o-transition:all linear 0.08s;
 	transition:all linear 0.08s;
 }
-.find-location:active {
+.location-detect:active {
 	background: #00a88c;
 	color: #e1f1ee;
 }
@@ -327,18 +326,18 @@ p {
 	background: #df4a32;
 }
 .button.lightorange {
-	background: #fc9a6b;
+	background: #fe9872;
 	font-weight: 900;
 }
 .button.green {
-	background: #00bd9e;
+	background: #00bea0;
 	font-weight: 900;
 }
 .button.lightorange:active {
 	background: #e78d62;
 }
 .button.green:active {
-	background: #00a58a;
+	background: #00bea0;
 }
 .find-restaurants {
 	font-size: 19px;
@@ -348,6 +347,20 @@ p {
 	letter-spacing: 0;
 }
 
+.button.get-food {
+	display: block;
+	font-size: 18px;
+	font-weight: bold;
+	width: 300px;
+	margin: 0 auto;
+	padding: .5em 0 .5em 0;
+	letter-spacing:1px;
+	margin-top: 7px;
+}
+.button.pushable.get-food:active {
+	margin-top: 10px;
+}
+
 
 
 /* GLOBAL */
@@ -355,14 +368,26 @@ p {
 	body {
 		font-size: 12px;
 	}
+	.menu.drop {
+		display: block;
+	}
+	.menu.side {
+		display: none;
+	}
 }
-@media(max-width:500px) {
+@media(max-width:499px) {
 	.logo {
 		width: 190px;
 		height: 37px;
 	}
 	.menu {
-		margin: 25px 0 0 10px;
+		margin: 3px 0 0 10px;
+	}
+	.menu.drop {
+		display: none;
+	}
+	.menu.side {
+		display: block;
 	}
 }
 .divider {
@@ -475,7 +500,7 @@ p {
 .faq-tomato {
 	background: url(/assets/images/micro/faq-tomato.svg) no-repeat;
 	width: 7.1em;
-	height: 11.6em;
+	height: 11.8em;
 	background-size: 100%;
 	float: left;
 	margin-left: 4em;
@@ -510,4 +535,72 @@ p {
 .faq-heart {
 	color: #ff6b82;
 	font-size: 8.5em;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* SNAPS */
+.snap-drawers {
+	display: none;
+}
+
+.button-bottom-wrapper {
+	-webkit-transition:bottom 0.5s ease;
+	-moz-transition:bottom 0.5s ease;
+	-ms-transition:bottom 0.5s ease;
+	-o-transition:bottom 0.5s ease;
+	transition:bottom 0.5s ease;
+
+	position:fixed;
+	left:0;
+	right:0;
+	z-index:102;
+	bottom:0;
+	width:100%;
+	background:#2b2937;
+	height:54px;
+
+	bottom: -67px;
+}
+
+.button-bottom-show {
+	bottom:0 !important;
+}
+
+
+
+.navs {
+	width:auto;
+	top:0;
+	left:0;
+	right:0;
+	position:fixed;
+	z-index:100;
+}
+.nav-top {
+	background: #f78155;
+	padding-top: 15px;
 }
\ No newline at end of file