diff --git a/config.js b/config.js
index 33ba37f..555f8f7 100644
--- a/config.js
+++ b/config.js
@@ -4,6 +4,7 @@ angular.module('flashy', [
     'flashy.HomeController',
     'flashy.FeedController',
     'flashy.DeckController',
+	'flashy.RequestResetController',
     'ngCookies']).
     config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
         '$locationProvider',
@@ -22,7 +23,7 @@ angular.module('flashy', [
                 }).
                 state('login', {
                     url: '/login',
-                    templateUrl: 'templates/login_form.html',
+                    templateUrl: 'templates/login.html',
                     controller: 'LoginController'
                 }).
                 state('logout', {
diff --git a/flashy.css b/flashy.css
index 50e7ddf..3348554 100644
--- a/flashy.css
+++ b/flashy.css
@@ -1,16 +1,7 @@
 #loginform input {
-    margin-top: 5px;
-	border: 0px none;
-	font: 16px/1.4 "Helvetica Neue","HelveticaNeue",Helvetica,Arial;
-	padding: 11px 10px 11px 13px;
-	width: 100%;
-	box-sizing: border-box;
+   
 }
 
-#loginform {
-    width: 100%;
-	max-height: 300px;
-}
 
 #sidebar {
     position:absolute;
@@ -22,6 +13,34 @@
 	color:#00AFD8;
 }
 
+.form-section {
+	width: 330px;
+	top: 50%;
+	position: relative;
+}
+
+.form-inputs {
+	margin-top: 0px;
+	border: 0px none;
+	font: 16px/1.4 "Helvetica Neue","HelveticaNeue",Helvetica,Arial;
+	padding: 5px 10px 11px 13px;
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.form-buttons {
+	margin-top: 10px;
+	width: 100%;
+	font-size: 16px;
+}
+
+.form-buttons .last-button {
+	float: right;
+}
+
 .container {
-    width: 500px;
+	position: relative;
+    width: 400px;
+	height: 80px;
 }
+
diff --git a/home.html b/home.html
index 7196b72..add4d69 100644
--- a/home.html
+++ b/home.html
@@ -27,6 +27,7 @@
 <script src="scripts/LoginController.js"></script>
 <script src="scripts/LogoutController.js"></script>
 <script src="scripts/DeckController.js"></script>
+<script src="scripts/RequestResetController.js"></script>
 
 
 
diff --git a/scripts/LoginController.js b/scripts/LoginController.js
index f5b2dac..2c716b7 100644
--- a/scripts/LoginController.js
+++ b/scripts/LoginController.js
@@ -3,38 +3,41 @@ angular.module('flashy.LoginController', ['ui.router']).
 controller('LoginController', ['$scope', '$state', '$http',
     function($scope, $state, $http) {
         'use strict';
-		$scope.varvar = false
-		$scope.emailError = false;
+		$scope.uniqueError = false;
 		$scope.loginError = false;
         $scope.login = function(email, password) {
             $http.post('/api/login', JSON.stringify({
                 'email': email,
                 'password': password
-            }))
-			.success(function(data) {
+            })).
+			success(function(data) {
                 $state.go('feed');
                 console.log(data);
-            })
-			.error(function(data, status, header, config) {
+            }).
+			error(function(data, status, header, config) {
 				if(data.detail) { // assume 'invalid email or pass' 
-					$scope.emailError = true;
+					$scope.loginError = true;
 				}
-				console.log(data)
+				console.log(data);
 			});
         };
         $scope.signUp = function(email, password) {
             $http.post('/api/register', JSON.stringify({
                 'email': email,
                 'password': password
-            }))
-			.success(function(data) {
+            })).
+			success(function(data) {
                 $state.go('feed');
                 console.log(data);
-            })
-			.error(function(data, status, headers, config) {
-				if(data.email) { // assume 'email not unique' error
-					$scope.emailError = true;
-					email.forcus();
+            }).
+			error(function(data, status, headers, config) {
+				console.log(data.email);
+				if(data.email == "This field is required.") { 
+					$scope.invalid = true;
+					$scope.uniqueError = false;
+				} else if(data.email) {	// assume 'email not unique' error
+					$scope.uniqueError = true;
+					$scope.invalid = false;
 				}
 				console.log(data);
 			});
diff --git a/scripts/RequestResetController.js b/scripts/RequestResetController.js
index bd68b1f..dc64dc1 100644
--- a/scripts/RequestResetController.js
+++ b/scripts/RequestResetController.js
@@ -1,25 +1,28 @@
-angular.module('flashy.RequestResetController', ['ui.router']).
+angular.module('flashy.RequestResetController', ['ui.router'])
 
-controller('RequestResetController', ['$scope', '$state', 'http',
+.controller('RequestResetController', ['$scope', '$state', '$http',
 	function($scope, $state, $http) {
 		'use strict';
 		$scope.success = false;
-		$scope.alert = false;
+		$scope.invalid = false;
 		$scope.resetPass = function(email) {
 			$http.post('/api/request_password_reset', JSON.stringify({
 				'email': email
 			}))
 			.success(function(data) {
 				$scope.success = true;
+				$state.go('passwordreset');
 				console.log(data);
 			})
 			.error(function(data, status, header, config) {
 				if(data.email) {
-					$scope.success = false;
-					$scope.alert = true;
+					$scope.invalid = true;
 				}
-				console.log(data)
+				console.log(data);
 			});
-		}
+		};
+		$scope.cancel = function() {
+			$state.go('home');
+		};
 	}
 ]);
\ No newline at end of file
diff --git a/templates/login.html b/templates/login.html
new file mode 100644
index 0000000..7da7812
--- /dev/null
+++ b/templates/login.html
@@ -0,0 +1,76 @@
+<div class="content">
+  <form id="loginform">
+    <div class="container">
+      <h1 class="text-success heading">FLASHY</h1>
+      <blockquote class="pull-left" id="loginquote">
+        <p>The System shall enlighten.<br>The User shall be enlightened.</p>
+        <small>SWAG</small>
+      </blockquote>
+    </div>
+
+    <div class="form-section">
+        <!-- REGISTRATION TABS  -->
+        <div class="tabbable">
+            <ul class="nav nav-pills nav-justified">
+                <li role="presentation" class="active"><a href="#tab1" data-toggle="tab">SIGN UP</a></li>
+                <li role="presentation"><a href="#tab2" data-toggle="tab">LOGIN</a></li>
+            </ul>
+        </div>
+
+        <!-- REGISTRATION PANES -->
+        <div class="tab-content" id="registration_forms">
+            <!-- LOGIN FORM -->
+            <div class="tab-pane myform" id="tab2">
+                <div class="form-inputs" name="login_form_input">
+					<div class="check-element animate-show" role="alert" ng-show="loginError">
+						<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+						<span style="color:#8E2323">Invalid username or password!!</span>
+                    </div>
+                    <div class="form-group">
+                        <input type="email" class="form-control" ng-model="loginEmail" placeholder="Email" required />
+                    </div>
+                    <div class="form-group">
+                        <input type="password" class="form-control" ng-model="loginPassword" placeholder="Password" required />
+                    </div>
+					<input type="submit" class="btn btn-primary btn-block" ng-click="login(loginEmail, loginPassword)" value="Login!" />
+				</div>
+            </div>
+			
+			<!-- SIGN UP FORM -->
+            <div class="tab-pane active myform" id="tab1">
+                <div class="form-inputs" name="register_form_input">
+					<div class="check-element animate-show" role="alert" ng-show="uniqueError">
+						<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+						<span style="color:#8E2323">Email already registered!</span>
+					</div>
+					<div class="form-group">	
+						<input name="email" type="email" class="form-control" ng-model="loginEmail" placeholder="Email" required />
+					</div>
+					<div class="form-group">
+						<input name="password" type="password" class="form-control" ng-model="signUpPassword" placeholder="Password" required />
+					</div>
+					<input type="submit" class="btn btn-primary btn-block" ng-click="signUp(loginEmail, signUpPassword)" value="Sign up!" />
+				</div>
+            </div>
+        </div>
+		
+		<!-- FORGOT PASS -->
+		<div class="disclaimer">
+			<a class="trigger-password-reset" ng-click="triggerPasswordReset()" href="#">forget ur password???</a>
+		</div>
+    </div>
+
+
+
+
+    <!--<div>
+      <input type="email" class="form-control" ng-model="loginEmail" placeholder="Email"/>
+    </div>
+    <div class="form-group">
+      <input type="password" class="form-control" ng-model="loginPassword" placeholder="Password"/>
+    </div>
+    <input type="submit" class="btn btn-primary" ng-click="login(loginEmail, loginPassword)" value="LOGIN"/>
+    <input type="submit" class="btn btn-primary" ng-click="register(loginEmail, loginPassword)" value="REGISTER"/>
+	-->
+  </form>
+</div>
diff --git a/templates/requestpasswordreset.html b/templates/requestpasswordreset.html
new file mode 100644
index 0000000..fb8bcb5
--- /dev/null
+++ b/templates/requestpasswordreset.html
@@ -0,0 +1,26 @@
+<div class="content">
+	<div class="container">
+      <h1 class="text-muted">Reset Password</h1>
+    </div>
+	<div name="passreset" class="form-section">
+		<form class="form-inputs" name="passreset_form">
+			<div class="check-element animate-show" role="alert" ng-show="invalid">
+				<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+				<span style="color:#8E2323">Enter a valid email!</span>
+			</div>
+			<div class="form-group">
+				<input type="email" class="form-control" ng-model="user_email" placeholder="Email" required />
+			</div>
+			<div class="form-buttons">
+				<div class="btn-group">
+					<button type="button" class="btn btn-default" ng-click="cancel()"><strong>Cancel</strong></button>
+				</div>
+				<div class="last-button">
+					<div class="btn-group">
+						<button type="button" class="btn btn-danger" ng-click="resetPass(user_email)"><strong>Reset Password</strong></button>
+					</div>
+				</div>
+			</div>
+		</form>
+	</div>
+</div>
\ No newline at end of file