diff --git a/resources/views/albums/index.blade.php b/resources/views/albums/index.blade.php
new file mode 100644
index 00000000..88c8783d
--- /dev/null
+++ b/resources/views/albums/index.blade.php
@@ -0,0 +1,6 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>Album Listing!</h1>
+	<p>This page should be what search engines see</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/albums/show.blade.php b/resources/views/albums/show.blade.php
new file mode 100644
index 00000000..ff1c68da
--- /dev/null
+++ b/resources/views/albums/show.blade.php
@@ -0,0 +1,6 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>Album!</h1>
+	<p>This page should be what search engines see</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/artists/index.blade.php b/resources/views/artists/index.blade.php
new file mode 100644
index 00000000..efc046b9
--- /dev/null
+++ b/resources/views/artists/index.blade.php
@@ -0,0 +1,6 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>Artist Listing!</h1>
+	<p>This page should be what search engines see</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/artists/profile.blade.php b/resources/views/artists/profile.blade.php
new file mode 100644
index 00000000..ec68134b
--- /dev/null
+++ b/resources/views/artists/profile.blade.php
@@ -0,0 +1,6 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>Artist Profile!</h1>
+	<p>This page should be what search engines see</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
new file mode 100644
index 00000000..f9b58441
--- /dev/null
+++ b/resources/views/auth/login.blade.php
@@ -0,0 +1,6 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>Login</h1>
+	<p>This page should be what search engines see</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
new file mode 100644
index 00000000..8f70767c
--- /dev/null
+++ b/resources/views/auth/register.blade.php
@@ -0,0 +1,6 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>Register</h1>
+	<p>This page should be what search engines see</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/errors/400.blade.php b/resources/views/errors/400.blade.php
new file mode 100644
index 00000000..bfc98077
--- /dev/null
+++ b/resources/views/errors/400.blade.php
@@ -0,0 +1,12 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>400 - Invalid Request</h1>
+	<p>Your request was invalid.</p>
+@endsection
+
+@section('app_scripts')
+	<script>
+		window.pfm.error = 400;
+	</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
new file mode 100644
index 00000000..3c1d4e61
--- /dev/null
+++ b/resources/views/errors/403.blade.php
@@ -0,0 +1,12 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>403 - Not Authorized</h1>
+	<p>You cannot do this.</p>
+@endsection
+
+@section('app_scripts')
+	<script>
+		window.pfm.error = 403;
+	</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
new file mode 100644
index 00000000..05b9d0ed
--- /dev/null
+++ b/resources/views/errors/404.blade.php
@@ -0,0 +1,12 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>404 - Not Found</h1>
+	<p>We could not find what you were looking for.</p>
+@endsection
+
+@section('app_scripts')
+	<script>
+		window.pfm.error = 404;
+	</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
new file mode 100644
index 00000000..809aac05
--- /dev/null
+++ b/resources/views/errors/500.blade.php
@@ -0,0 +1,12 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>400 - Server Error</h1>
+	<p>There was an error in the server.</p>
+@endsection
+
+@section('app_scripts')
+	<script>
+		window.pfm.error = 500;
+	</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php
new file mode 100644
index 00000000..aa6e3cf7
--- /dev/null
+++ b/resources/views/home/index.blade.php
@@ -0,0 +1,12 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>Welcome to Pony.fm</h1>
+	<p>The pony fan music site. By bronies, for bronies.</p>
+	<p>
+		We provide a comprehensive set of free tools to host, distribute, and catalogue your music, integrated with a rich community experience for artists and listeners alike.
+	</p>
+	<p>
+		Features include <strong>unlimited downloads</strong>, <strong>unlimited uploads</strong>, <strong>lossless uploads</strong> and much more! Click <a href="/about">here</a> for more details!
+	</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/about.blade.php b/resources/views/pages/about.blade.php
new file mode 100644
index 00000000..eb7d6bcb
--- /dev/null
+++ b/resources/views/pages/about.blade.php
@@ -0,0 +1,5 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	{{Helpers::template('pages/about.html')}}
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/faq.blade.php b/resources/views/pages/faq.blade.php
new file mode 100644
index 00000000..00ebfbfa
--- /dev/null
+++ b/resources/views/pages/faq.blade.php
@@ -0,0 +1,5 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	{{Helpers::template('pages/faq.html')}}
+@endsection
\ No newline at end of file
diff --git a/resources/views/playlists/index.blade.php b/resources/views/playlists/index.blade.php
new file mode 100644
index 00000000..4626fe77
--- /dev/null
+++ b/resources/views/playlists/index.blade.php
@@ -0,0 +1,6 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>Playlist Listing!</h1>
+	<p>This page should be what search engines see</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/playlists/show.blade.php b/resources/views/playlists/show.blade.php
new file mode 100644
index 00000000..51d87fff
--- /dev/null
+++ b/resources/views/playlists/show.blade.php
@@ -0,0 +1,6 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>A Playlist!</h1>
+	<p>This page should be what search engines see</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
new file mode 100644
index 00000000..1a1cf180
--- /dev/null
+++ b/resources/views/shared/_app_layout.blade.php
@@ -0,0 +1,134 @@
+@extends('shared._layout')
+
+@section('content')
+
+	<div id="fb-root"></div>
+
+	<script>
+		window.fbAsyncInit = function() {
+			FB.init({
+				appId      : '186765381447538',
+				status: true,
+				cookie: true,
+				xfbml: true
+			});
+		};
+
+		(function(d, s, id){
+			var js, fjs = d.getElementsByTagName(s)[0];
+			if (d.getElementById(id)) {return;}
+			js = d.createElement(s); js.id = id;
+			js.src = "//connect.facebook.net/en_US/all.js";
+			fjs.parentNode.insertBefore(js, fjs);
+		}(document, 'script', 'facebook-jssdk'));
+	</script>
+
+	<header>
+		<a href="/">
+            <img src="/images/fm_logo_white.svg" class="logo">
+			<!-- <img src="https://poniverse.net/img/logos/fm_logo.svg" class="logo"> -->
+        </a>
+		<div class="now-playing">
+			@if (Auth::check())
+				<div class="user-details dropdown">
+					<a class="avatar dropdown-toggle" href="#">
+						<img src="{{Auth::user()->getAvatarUrl(\App\Image::THUMBNAIL)}}" />
+						<span><i class="icon-chevron-down"></i></span>
+					</a>
+					<ul class="dropdown-menu">
+						<li><a href="{{Auth::user()->url}}">Your Profile</a></li>
+						<li><a href="#" pfm-eat-click ng-click="logout()">Logout</a></li>
+					</ul>
+				</div>
+			@endif
+			<pfm-player></pfm-player>
+		</div>
+	</header>
+
+	<div class="site-body">
+		<ul class="sidebar" ng-controller="sidebar">
+			@if (Auth::check())
+				<li ng-class="{selected: stateIncludes('home')}"><a href="/">Dashboard</a></li>
+			@else
+				<li ng-class="{selected: stateIncludes('home')}"><a href="/">Home</a></li>
+			@endif
+			<li ng-class="{selected: (stateIncludes('content') && !isPinnedPlaylistSelected)}">
+				<a href="/tracks">Discover</a>
+			</li>
+
+			@if (Auth::check())
+				<li ng-class="{selected: stateIncludes('favourites')}"><a href="/account/favourites/tracks">Favourites</a></li>
+				<li ng-class="{selected: stateIncludes('account')}"><a href="/account/tracks">Account</a></li>
+			@endif
+
+			<li ng-class="{selected: isActive('/about')}"><a href="/about">About</a></li>
+
+			@if (Auth::check())
+				<li class="uploader" ng-class="{selected: stateIncludes('uploader')}">
+					<a href="/account/uploader">Upload Music</a>
+				</li>
+				<li>
+					<h3>
+						<a href="#" ng-click="createPlaylist()" pfm-eat-click title="Create Playlist"><i class="icon-plus"></i></a>
+						Playlists
+					</h3>
+				</li>
+				<li class="none" ng-show="!playlists.length"><span>no pinned playlists</span></li>
+				<li class="dropdown" ng-repeat="playlist in playlists" ng-cloak ng-class="{selected: stateIncludes('content.playlist') && $state.params.id == playlist.id}">
+					<a href="{{Helpers::angular('playlist.url')}}" ng-bind="playlist.title"></a>
+				</li>
+			@else
+				<li><a href="/login" target="_self">Login</a></li>
+				<li><a href="/register" target="_self">Register</a></li>
+			@endif
+		</ul>
+		<ui-view class="site-content">
+			@yield('app_content')
+		</ui-view>
+	</div>
+
+@endsection
+
+@section('styles')
+	<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Josefin+Sans" />
+	<link rel="stylesheet" href="/styles/loader.css" />
+	{{ Assets::styleIncludes() }}
+@endsection
+
+@section('scripts')
+	<script>
+		window.pfm = {
+			token: "{{Session::token()}}",
+			auth: {
+				@if (Auth::check())
+					isLogged: true,
+					user: {{Auth::user()->toJson()}}
+				@else
+					isLogged: false
+				@endif
+			}
+		};
+	</script>
+
+	<script>
+		{{-- Google Analytics --}}
+		var _gaq = _gaq || [];
+		_gaq.push(['_setAccount', 'UA-29463256-1']);
+		_gaq.push(['_setDomainName', 'pony.fm']);
+
+		(function() {
+			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+		})();
+	</script>
+
+	{{ Assets::scriptIncludes() }}
+
+    @if (!Config::get("app.debug"))
+        <script src="/build/scripts/templates.js"></script>
+    @endif
+
+	@yield('app_scripts')
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/shared/_layout.blade.php b/resources/views/shared/_layout.blade.php
new file mode 100644
index 00000000..49638465
--- /dev/null
+++ b/resources/views/shared/_layout.blade.php
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+		<title>Pony.fm</title>
+		<meta name="description" content="" />
+		<meta name="viewport" content="width=device-width" />
+		<base href="/" />
+
+		@yield('styles')
+	</head>
+	<body ng-app="ponyfm" ng-controller="application" class="{{Auth::check() ? 'is-logged' : ''}}">
+		@yield('content')
+		@yield('scripts')
+	</body>
+</html>
\ No newline at end of file
diff --git a/resources/views/shared/null.blade.php b/resources/views/shared/null.blade.php
new file mode 100644
index 00000000..771f9b9d
--- /dev/null
+++ b/resources/views/shared/null.blade.php
@@ -0,0 +1,5 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<p>If you see this page, something went wrong.</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/tracks/embed.blade.php b/resources/views/tracks/embed.blade.php
new file mode 100644
index 00000000..53e9d4b4
--- /dev/null
+++ b/resources/views/tracks/embed.blade.php
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html lang="en-CA">
+<head>
+	<meta charset="UTF-8">
+	<title>{{$track->title}} by {{$track->user->display_name}} on Pony.fm</title>
+	<meta itemprop="name" content="Pony.fm">
+	<meta property="og:title" content="Pony.fm - The Pony Music Hosting Site" />
+	<meta property="og:type" content="website" />
+	<meta property="og:url" content="https://pony.fm/" />
+	<meta property="og:image" content="https://pony.fm/favicon.ico" />
+	<meta property="og:site_name" content="Pony.fm" />
+	<meta property="fb:admins" content="1165335382" />
+	<base href="/" />
+
+	{{ Assets::styleIncludes('embed') }}
+</head>
+<body>
+	@if($track->explicit && !(Auth::check() && Auth::user()->can_see_explicit_content))
+		<div class="explicit alert alert-danger">
+			<em>Enable explicit content in {{ HTML::link(URL::to('/account/settings'), 'your account', ['target' => '_blank']) }} to play this track.</em>
+			<div class="stats">
+				<span>Hosted by <a href="{{URL::to('/')}}" target="_blank">Pony.fm</a></span>
+			</div>
+		</div>
+	@else
+		<div class="player loading {{Auth::check() ? 'can-favourite' : ''}} {{$user['is_favourited'] ? 'favourited' : ''}}" data-track-id="{{ $track->id }}" data-duration="{{ $track->duration * 1000 }}">
+			<div class="play" disabled="disabled">
+				<div class="button"><i class="icon-play"></i></div>
+				{{ HTML::image($track->getCoverUrl(\App\Image::SMALL)) }}
+			</div>
+			<div class="meta">
+				@if (Auth::check())
+					<a href="#" class="favourite"><i title="Favourite this track!" class="favourite-icon icon-star-empty"></i></a>
+				@endif
+				<div class="progressbar">
+					<div class="loader"></div>
+					<div class="seeker"></div>
+				</div>
+				<span class="title">{{ HTML::link( $track->url, $track->title, ['target' => '_blank'] ) }}</span>
+				<span>by: <strong>{{ HTML::link($track->user->url, $track->user->display_name, ['target' => '_blank']) }}</strong> / {{$track->genre->name}} / {{Helpers::timestamp($track->published_at)}}</span>
+			</div>
+			<div class="stats">
+				Views: <strong>{{ $track->view_count }}</strong> / Plays: <strong>{{ $track->play_count }}</strong> / Downloads: <strong>{{ $track->download_count }}</strong> /
+				<span>Hosted by <a href="{{URL::to('/')}}" target="_blank">Pony.fm</a></span>
+			</div>
+		</div>
+	@endif
+
+	<script>
+		var pfm = {token: '{{ Session::token() }}'}
+	</script>
+
+	{{ Assets::scriptIncludes('embed') }}
+
+	<script type="text/javascript">
+		var _gaq = _gaq || [];
+		_gaq.push(['_setAccount', 'UA-29463256-1']);
+		_gaq.push(['_setDomainName', 'pony.fm']);
+		_gaq.push(['_trackPageview']);
+
+		(function() {
+			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+		})();
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/views/tracks/index.blade.php b/resources/views/tracks/index.blade.php
new file mode 100644
index 00000000..007bb625
--- /dev/null
+++ b/resources/views/tracks/index.blade.php
@@ -0,0 +1,6 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>Track Listing!</h1>
+	<p>This page should be what search engines see</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/tracks/show.blade.php b/resources/views/tracks/show.blade.php
new file mode 100644
index 00000000..007bb625
--- /dev/null
+++ b/resources/views/tracks/show.blade.php
@@ -0,0 +1,6 @@
+@extends('shared._app_layout')
+
+@section('app_content')
+	<h1>Track Listing!</h1>
+	<p>This page should be what search engines see</p>
+@endsection
\ No newline at end of file
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
deleted file mode 100644
index cb5d3530..00000000
--- a/resources/views/welcome.blade.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Laravel</title>
-
-        <link href="//fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
-
-        <style>
-            html, body {
-                height: 100%;
-            }
-
-            body {
-                margin: 0;
-                padding: 0;
-                width: 100%;
-                display: table;
-                font-weight: 100;
-                font-family: 'Lato';
-            }
-
-            .container {
-                text-align: center;
-                display: table-cell;
-                vertical-align: middle;
-            }
-
-            .content {
-                text-align: center;
-                display: inline-block;
-            }
-
-            .title {
-                font-size: 96px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <div class="content">
-                <div class="title">Laravel 5</div>
-            </div>
-        </div>
-    </body>
-</html>