diff --git a/app/elements/about-us/about-us.html b/app/elements/about-us/about-us.html
new file mode 100644
index 0000000..61112f9
--- /dev/null
+++ b/app/elements/about-us/about-us.html
@@ -0,0 +1,20 @@
+<link rel="import" href="../elements.html">
+
+<dom-module id="about-us">
+	<style>
+		:host {
+			height: 100%;
+			width: 100%;
+		}
+	</style>
+	<template>
+		<h1>About us Page</h1>
+	</template>
+</dom-module>
+<script>
+	( function() {
+		Polymer({
+			is: 'about-us'
+		});
+	})();
+</script>
\ No newline at end of file
diff --git a/app/elements/elements.html b/app/elements/elements.html
index bb725c9..24fec3f 100755
--- a/app/elements/elements.html
+++ b/app/elements/elements.html
@@ -13,6 +13,7 @@
 <link rel="import" href="../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../bower_components/iron-selector/iron-selector.html">
+<link rel="import" href="../bower_components/iron-image/iron-image.html">
 
 <!-- Paper elements -->
 <link rel="import" href="../bower_components/paper-drawer-panel/paper-drawer-panel.html">
@@ -24,6 +25,8 @@
 <link rel="import" href="../bower_components/paper-styles/paper-styles-classes.html">
 <link rel="import" href="../bower_components/paper-toast/paper-toast.html">
 <link rel="import" href="../bower_components/paper-toolbar/paper-toolbar.html">
+<link rel="import" href="../bower_components/paper-tabs/paper-tabs.html" >
+<link rel="import" href="../bower_components/paper-tabs/paper-tab.html" >
 
 <!-- Platinum elements -->
 <!--
@@ -36,8 +39,9 @@
 
 <!-- Add your elements here -->
 <link rel="import" href="../styles/app-theme.html">
-<link rel="import" href="my-greeting/my-greeting.html">
-<link rel="import" href="my-list/my-list.html">
+<link rel="import" href="new-episode/new-episode.html">
+<link rel="import" href="previous-episodes/previous-episodes.html">
+<link rel="import" href="about-us/about-us.html">
 
 <!-- Configure your routes here -->
 <link rel="import" href="routing.html">
diff --git a/app/elements/my-greeting/my-greeting.html b/app/elements/my-greeting/my-greeting.html
deleted file mode 100755
index ac131a7..0000000
--- a/app/elements/my-greeting/my-greeting.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-@license
-Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-
-<dom-module id="my-greeting">
-  <style>
-    :host {
-      display: block;
-    }
-
-    @media (max-width: 600px) {
-      h1.paper-font-display1 {
-        font-size: 24px;
-      }
-    }
-  </style>
-  <template>
-    <h1 class="paper-font-display1"><span>{{greeting}}</span></h1>
-    <span class="paper-font-body2">Update text to change the greeting.</span>
-    <!-- Listens for "input" event and sets greeting to <input>.value -->
-    <input class="paper-font-body2" value="{{greeting::input}}">
-  </template>
-</dom-module>
-<script>
-  (function() {
-    Polymer({
-      is: 'my-greeting',
-
-      properties: {
-        greeting: {
-          type: String,
-          value: 'Welcome!',
-          notify: true
-        }
-      }
-    });
-  })();
-</script>
diff --git a/app/elements/my-list/my-list.html b/app/elements/my-list/my-list.html
deleted file mode 100755
index a4b5082..0000000
--- a/app/elements/my-list/my-list.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-@license
-Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-
-<dom-module id="my-list">
-  <style>
-    :host {
-      display: block;
-    }
-  </style>
-  <template>
-    <ul>
-      <template is="dom-repeat" items="{{items}}">
-        <li><span class="paper-font-body1">{{item}}</span></li>
-      </template>
-    </ul>
-  </template>
-</dom-module>
-<script>
-  (function () {
-    Polymer({
-      is: 'my-list',
-      properties: {
-        items: {
-          type: Array,
-          notify: true,
-        }
-      },
-      ready: function() {
-        this.items = [
-          'Responsive Web App boilerplate',
-          'Iron Elements and Paper Elements',
-          'End-to-end Build Tooling (including Vulcanize)',
-          'Unit testing with Web Component Tester',
-          'Routing with Page.js',
-          'Offline support with the Platinum Service Worker Elements'
-        ];
-      }
-    });
-  })();
-</script>
diff --git a/app/elements/new-episode/new-episode.html b/app/elements/new-episode/new-episode.html
new file mode 100644
index 0000000..16f8a7b
--- /dev/null
+++ b/app/elements/new-episode/new-episode.html
@@ -0,0 +1,20 @@
+<link rel="import" href="../elements.html">
+
+<dom-module id="new-episode">
+	<style>
+		:host {
+			height: 100%;
+			width: 100%;
+		}
+	</style>
+	<template>
+		<h1>New Episode Page</h1>
+	</template>
+</dom-module>
+<script>
+	( function() {
+		Polymer({
+			is: 'new-episode'
+		});
+	})();
+</script>
\ No newline at end of file
diff --git a/app/elements/previous-episodes/previous-episodes.html b/app/elements/previous-episodes/previous-episodes.html
new file mode 100644
index 0000000..bbbae3f
--- /dev/null
+++ b/app/elements/previous-episodes/previous-episodes.html
@@ -0,0 +1,20 @@
+<link rel="import" href="../elements.html">
+
+<dom-module id="previous-episodes">
+	<style>
+		:host {
+			height: 100%;
+			width: 100%;
+		}
+	</style>
+	<template>
+		<h1>Previous Episodes Page</h1>
+	</template>
+</dom-module>
+<script>
+	( function() {
+		Polymer({
+			is: 'previous-episodes'
+		});
+	})();
+</script>
\ No newline at end of file
diff --git a/app/elements/routing.html b/app/elements/routing.html
index 2f7d01c..4f8f9b4 100755
--- a/app/elements/routing.html
+++ b/app/elements/routing.html
@@ -16,20 +16,20 @@
     // client-side router inspired by the Express router
     // More info: https://visionmedia.github.io/page.js/
     page('/', function () {
-      app.route = 'home';
+      app.route = 'new';
     });
 
-    page('/users', function () {
-      app.route = 'users';
+    page('/old', function () {
+      app.route = 'old';
     });
 
-    page('/users/:name', function (data) {
-      app.route = 'user-info';
+    page('/old/:id', function (data) {
+      app.route = 'old-episode';
       app.params = data.params;
     });
 
-    page('/contact', function () {
-      app.route = 'contact';
+    page('/about', function () {
+      app.route = 'about';
     });
 
     // add #! before urls
diff --git a/app/images/logo.png b/app/images/logo.png
new file mode 100644
index 0000000..a26d6e5
Binary files /dev/null and b/app/images/logo.png differ
diff --git a/app/index.html b/app/index.html
index b30860a..c76758d 100755
--- a/app/index.html
+++ b/app/index.html
@@ -16,7 +16,7 @@
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="generator" content="Polymer Starter Kit" />
-  <title>Polymer Starter Kit</title>
+  <title>The Web Platform Today</title>
   <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
 
   <!-- Chrome for Android theme color -->
@@ -59,134 +59,64 @@
   <span id="browser-sync-binding"></span>
   <template is="dom-bind" id="app">
 
-    <paper-drawer-panel id="paperDrawerPanel">
-      <div drawer>
-
-        <!-- Drawer Toolbar -->
-        <paper-toolbar id="drawerToolbar">
-          <span class="paper-font-title">Menu</span>
-        </paper-toolbar>
-
-        <!-- Drawer Content -->
-          <paper-menu class="list" attr-for-selected="data-route" selected="{{route}}" on-iron-select="onMenuSelect">
-              <a data-route="home" href="/">
-                <iron-icon icon="home"></iron-icon>
-                <span>Home</span>
-              </a>
-
-              <a data-route="users" href="/users">
-                <iron-icon icon="info"></iron-icon>
-                <span>Users</span>
-              </a>
-
-              <a data-route="contact" href="/contact">
-                <iron-icon icon="mail"></iron-icon>
-                <span>Contact</span>
-              </a>
-          </paper-menu>
-      </div>
-      <paper-header-panel main mode="waterfall-tall">
-
-        <!-- Main Toolbar -->
-        <paper-toolbar id="mainToolbar">
-          <paper-icon-button id="paperToggle" icon="menu" paper-drawer-toggle></paper-icon-button>
-          <span class="flex"></span>
-
-          <!-- Toolbar icons -->
-          <paper-icon-button icon="refresh"></paper-icon-button>
-          <paper-icon-button icon="search"></paper-icon-button>
-
-          <!-- Application name -->
-          <div class="middle paper-font-display2 app-name">Polymer Starter Kit</div>
-
-          <!-- Application sub title -->
-          <div class="bottom title"></div>
-
-        </paper-toolbar>
-
-        <!-- Main Content -->
-        <div class="content">
-          <iron-pages attr-for-selected="data-route" selected="{{route}}">
-
-            <section data-route="home">
-              <paper-material elevation="1">
-                <my-greeting></my-greeting>
-
-                <p class="paper-font-subhead">You now have:</p>
-                <my-list></my-list>
-
-                <p class="paper-font-body2">Looking for more Web App layouts? Check out our <a href="https://github.com/PolymerElements/app-layout-templates">layouts</a> collection. You can also <a href="http://polymerelements.github.io/app-layout-templates/">preview</a> them live.</p>
-              </paper-material>
-              <paper-material elevation="1">
-                <p class="paper-font-body2">This is another card.</p>
-              </paper-material>
-
-              <paper-material elevation="1" class="paper-font-body2">
-                <h1 id="license">License</h1>
-                <p>Everything in this repo is BSD style license unless otherwise specified.</p>
-                <p>Copyright (c) 2015 The Polymer Authors. All rights reserved.</p>
-                <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
-                <ul>
-                <li>Redistributions of source code must retain the above copyright
-                notice, this list of conditions and the following disclaimer.</li>
-                <li>Redistributions in binary form must reproduce the above
-                copyright notice, this list of conditions and the following disclaimer
-                in the documentation and/or other materials provided with the
-                distribution.</li>
-                <li>Neither the name of Google Inc. nor the names of its
-                contributors may be used to endorse or promote products derived from
-                this software without specific prior written permission.</li>
-                </ul>
-                <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
-              </paper-material>
-
-            </section>
-
-            <section data-route="users">
-              <paper-material elevation="1">
-                <h2 class="paper-font-display2">Users</h2>
-                <p>This is the users section</p>
-                <a href="/users/Rob">Rob</a>
-              </paper-material>
-            </section>
-
-            <section data-route="user-info">
-              <paper-material elevation="1">
-                <h2 class="paper-font-display2">
-                User:<span>{{params.name}}</span>
-                </h2>
-                <div>This is <span>{{params.name}}</span>'s section</div>
-              </paper-material>
-            </section>
-
-            <section data-route="contact">
-              <paper-material elevation="1">
-                <h2 class="paper-font-display2">Contact</h2>
-                <p>This is the contact section</p>
-              </paper-material>
-            </section>
-
-          </iron-pages>
-					<universal-footer>
-						<div multicol>
-							<div col>
-								<div row title>About the Web Platform Podcast</div>
-								<div row longtext>
-									Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer porta urna massa, vel gravida nulla hendrerit vel. Etiam sit amet tellus pretium, faucibus libero vitae, facilisis orci. Maecenas sed imperdiet ipsum. Integer imperdiet dignissim magna ut malesuada. Morbi vulputate lobortis odio a suscipit. Pellentesque sodales justo varius, blandit magna vel, aliquet sapien. Fusce nibh magna, porttitor a eleifend sit amet, commodo id dolor. Vivamus lobortis orci nec condimentum porta. Curabitur odio tortor, vestibulum cursus mauris semper, aliquam ultrices velit. Etiam tincidunt vulputate euismod. Suspendisse vitae dolor at libero lobortis tincidunt quis ac purus. Donec sed commodo leo, quis pellentesque nunc. Ut vestibulum arcu sed est vulputate, vel molestie sem accumsan. Proin ultrices tempus massa. Morbi feugiat nisi id hendrerit mollis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
-								</div>
+		<paper-header-panel main mode="standard" class="tall">
+
+			<!-- Main Toolbar -->
+			<paper-toolbar id="mainToolbar" class="tall layout vertical">
+				
+				<span class="flex"></span>
+
+				<!-- Toolbar icons -->
+				<paper-icon-button icon="refresh"></paper-icon-button>
+				<paper-icon-button icon="search"></paper-icon-button>
+
+				<!-- Application name -->
+				<div class="flex middle app-name layout horizontal">
+					<iron-image class="center" src="images/logo.png" style="width:100px; height:100px;" sizing="contain"></iron-image>
+					<h3 class="paper-font-display2 flex center">The Web Platform Today</h3>
+				</div>
+
+				<!-- Tabs in the toolbar -->
+				<paper-tabs attr-for-selected="data-route" selected="{{route}}" class="bottom self-end">
+
+					<paper-tab data-route="new">New Episode</paper-tab>
+					<paper-tab data-route="old">Previous Stuff</paper-tab>
+					<paper-tab data-route="about">About Us</paper-tab>
+
+				</paper-tabs>
+
+			</paper-toolbar>
+
+			<!-- Main Content -->
+			<div class="content">
+				
+				<!-- Tab Data -->
+				<iron-pages attr-for-selected="data-route" selected="{{route}}">
+					<new-episode data-route="new"></new-episode>
+					<previous-episodes data-route="old"></previous-episodes>
+					<about-us data-route="about"></about-us>
+				</iron-pages>
+				
+				<!-- Footer -->
+				<universal-footer>
+					<div multicol>
+						<div col>
+							<div row title>About the Web Platform Podcast</div>
+							<div row longtext>
+								Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer porta urna massa, vel gravida nulla hendrerit vel. Etiam sit amet tellus pretium, faucibus libero vitae, facilisis orci. Maecenas sed imperdiet ipsum. Integer imperdiet dignissim magna ut malesuada. Morbi vulputate lobortis odio a suscipit. Pellentesque sodales justo varius, blandit magna vel, aliquet sapien. Fusce nibh magna, porttitor a eleifend sit amet, commodo id dolor. Vivamus lobortis orci nec condimentum porta. Curabitur odio tortor, vestibulum cursus mauris semper, aliquam ultrices velit. Etiam tincidunt vulputate euismod. Suspendisse vitae dolor at libero lobortis tincidunt quis ac purus. Donec sed commodo leo, quis pellentesque nunc. Ut vestibulum arcu sed est vulputate, vel molestie sem accumsan. Proin ultrices tempus massa. Morbi feugiat nisi id hendrerit mollis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
 							</div>
-							<div col>
-								<div row title>About the Web Platform Podcast</div>
-								<div row longtext>
-									Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer porta urna massa, vel gravida nulla hendrerit vel. Etiam sit amet tellus pretium, faucibus libero vitae, facilisis orci. Maecenas sed imperdiet ipsum. Integer imperdiet dignissim magna ut malesuada. Morbi vulputate lobortis odio a suscipit. Pellentesque sodales justo varius, blandit magna vel, aliquet sapien. Fusce nibh magna, porttitor a eleifend sit amet, commodo id dolor. Vivamus lobortis orci nec condimentum porta. Curabitur odio tortor, vestibulum cursus mauris semper, aliquam ultrices velit. Etiam tincidunt vulputate euismod. Suspendisse vitae dolor at libero lobortis tincidunt quis ac purus. Donec sed commodo leo, quis pellentesque nunc. Ut vestibulum arcu sed est vulputate, vel molestie sem accumsan. Proin ultrices tempus massa. Morbi feugiat nisi id hendrerit mollis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
-								</div>
+						</div>
+						<div col>
+							<div row title>About the Web Platform Podcast</div>
+							<div row longtext>
+								Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer porta urna massa, vel gravida nulla hendrerit vel. Etiam sit amet tellus pretium, faucibus libero vitae, facilisis orci. Maecenas sed imperdiet ipsum. Integer imperdiet dignissim magna ut malesuada. Morbi vulputate lobortis odio a suscipit. Pellentesque sodales justo varius, blandit magna vel, aliquet sapien. Fusce nibh magna, porttitor a eleifend sit amet, commodo id dolor. Vivamus lobortis orci nec condimentum porta. Curabitur odio tortor, vestibulum cursus mauris semper, aliquam ultrices velit. Etiam tincidunt vulputate euismod. Suspendisse vitae dolor at libero lobortis tincidunt quis ac purus. Donec sed commodo leo, quis pellentesque nunc. Ut vestibulum arcu sed est vulputate, vel molestie sem accumsan. Proin ultrices tempus massa. Morbi feugiat nisi id hendrerit mollis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
 							</div>
 						</div>
-						<div copyright-center>© 2015 The Web Platform Today</div>
-					</universal-footer>
-        </div>
-      </paper-header-panel>
-    </paper-drawer-panel>
+					</div>
+					<div copyright-center>© 2015 The Web Platform Today</div>
+				</universal-footer>
+			</div>
+		</paper-header-panel>
 
     <paper-toast id="caching-complete"
                  duration="6000"
diff --git a/app/styles/app-theme.html b/app/styles/app-theme.html
index 9e36bc2..504b1ae 100755
--- a/app/styles/app-theme.html
+++ b/app/styles/app-theme.html
@@ -103,6 +103,9 @@
   #mainToolbar .middle {
     margin-left: 48px;
   }
+	#mainToolbar .middle h3 {
+		font-weight: 100;
+	}
 
   #mainToolbar.has-shadow .middle {
     font-size: 20px;
@@ -110,10 +113,7 @@
     margin-left: 48px;
   }
 
-  /* Height of the scroll area */
-  .content {
-    height: 900px;
-  }
+  
 		
 	universal-footer {
 		--universal-footer-background-color: black;
@@ -121,7 +121,22 @@
 		--universal-footer-col-title-color: #0170ba;
 		--universal-footer-padding: 40px;
 	}
-
+	
+	paper-toolbar {
+		height: 200px;
+	}
+	
+	--paper-tabs {
+		margin-top: 18px;
+	}
+		
+	paper-tabs {
+		margin-top: 18px;
+		margin-left: 50px;
+	}
+	paper-tab {
+		min-width: 150px;
+	}
   /* Breakpoints */
 
   /* Small */
@@ -199,9 +214,23 @@
    */
 
   /* mobile-small */
-  @media all and (min-width: 0) and (max-width: 360px) and (orientation: portrait) { }
-  /* mobile-large */
-  @media all and (min-width: 361px) and (orientation: portrait) { }
+  @media all and (min-width: 0) and (max-width: 480px) and (orientation: portrait) { 
+		.app-name {
+			margin-left: 10px !important;
+			margin-top: 50px;
+		}
+		.app-name iron-image {
+			max-width: 50px;
+			display: block;
+		}
+		.app-name h3 {
+			font-size: 20px;
+		}
+		
+		paper-toolbar paper-tabs {
+			display: none;
+		}
+	}
   /* mobile-small-landscape */
   @media all and (min-width: 0) and (max-width: 480px) and (orientation: landscape) { }
   /* mobile-large-landscape */
@@ -209,7 +238,10 @@
   /* tablet-small-landscape */
   @media all and (min-width: 600px) and (max-width: 960px) and (orientation: landscape) { }
   /* tablet-large-landscape */
-  @media all and (min-width: 961px) and (orientation: landscape) { }
+  @media all and (min-width: 961px) and (orientation: landscape) { 
+	
+	
+	}
   /* tablet-small */
   @media all and (min-width: 600px) and (orientation: portrait) { }
   /* tablet-large */
diff --git a/app/styles/main.css b/app/styles/main.css
index 1c9ea79..c00982b 100755
--- a/app/styles/main.css
+++ b/app/styles/main.css
@@ -12,3 +12,19 @@ body {
   font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif;
   color: #333;
 }
+
+.app-name{
+	margin-top: 30px;
+	margin-bottom: 30px
+}
+.app-name iron-image {
+	margin: auto;
+}
+
+.app-name h3 {
+	margin: auto 20px;
+}
+
+.bottom {
+	height: 100%;
+}
\ No newline at end of file
diff --git a/bower.json b/bower.json
index 99b693d..d0d8c8f 100755
--- a/bower.json
+++ b/bower.json
@@ -18,12 +18,15 @@
     "tests"
   ],
   "dependencies": {
-    "iron-elements": "PolymerElements/iron-elements#1.0.0",
+    "iron-elements": "PolymerElements/iron-elements#1.0.2",
     "paper-elements": "PolymerElements/paper-elements#1.0.1",
     "platinum-elements": "PolymerElements/platinum-elements#1.0.1",
     "neon-elements": "PolymerElements/neon-elements#1.0.0",
     "page": "visionmedia/page.js#~1.6.3",
-    "universal-footer": "*"
+    "universal-footer": "*",
+    "podcast-player": "~1.0.1",
+    "iron-image": "PolymerElements/iron-image#~1.0.2",
+    "paper-tabs": "PolymerElements/paper-tabs#~1.0.1"
   },
   "devDependencies": {
     "web-component-tester": "*",