diff --git a/scripts/RequestResetController.js b/scripts/RequestResetController.js
index de6c139..d4dae34 100644
--- a/scripts/RequestResetController.js
+++ b/scripts/RequestResetController.js
@@ -4,7 +4,7 @@ angular.module('flashy.RequestResetController', ['ui.router'])
         function($scope, $state, $http) {
             'use strict';
             $scope.success = false;
-            $scope.invalid = false;
+            $scope.error = false;
             $scope.resetPass = function(email) {
                 $http.post('/api/request_password_reset', JSON.stringify({
                     'email': email
@@ -16,7 +16,7 @@ angular.module('flashy.RequestResetController', ['ui.router'])
                     })
                     .error(function(data, status, header, config) {
                         if (data.email) {
-                            $scope.invalid = true;
+                            $scope.error = true;
                         }
                         console.log(data);
                     });
diff --git a/scripts/ResetPasswordController.js b/scripts/ResetPasswordController.js
index 1a590fe..41fd9ac 100644
--- a/scripts/ResetPasswordController.js
+++ b/scripts/ResetPasswordController.js
@@ -3,10 +3,13 @@ angular.module('flashy.ResetPasswordController', ['ui.router']).
 	controller('ResetPasswordController', ['$scope', '$state', '$http',
 		function($scope, $state, $http) {
 			'use strict';
-			var url = document.location.href.split("/");
+			var url = document.location.href.split('/');
 			var token = url[url.length-1];
 			var uid = url[url.length-2];
 			$scope.error = false;
+			/*if(token == 'resetpassword') {
+				$state.go('login');
+			}*/
 			$scope.confirmResetPass = function(newPassword) {
 				$http.post('/api/reset_password', JSON.stringify({
 					'uid': uid,
diff --git a/templates/requestpasswordreset.html b/templates/requestpasswordreset.html
index cfb5b6f..f1be011 100644
--- a/templates/requestpasswordreset.html
+++ b/templates/requestpasswordreset.html
@@ -1,26 +1,33 @@
-<div class="content">
-	<div class="container">
-      <h1 class="text-muted">Reset Password</h1>
+<div class="container">
+<div class="row">
+<div class="offset-s2 col s8">
+<div class="card">
+  <form class="col s12" name="passreset_form">
+    <div class="card-content">
+        <h2>Reset Password</h2>
     </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 style="color:#8E2323">Enter a valid email!</span>
-			</div>
-      <!--FORM INPUTS-->
-			<div class="form-group">
-				<input type="email" class="form-control" ng-model="user_email" placeholder="Email" required />
-			</div>
-			<div class="row">
-				<div class="btn-group">
-					<button type="button" class="btn btn-default" ng-click="cancelReset()"><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 class="divider"></div>
+    <div name="passreset" class="card-content">
+      <div class="section">
+        <div ng-show="error" role="error">
+          <i style="color:#8E2323" class="mdi-alert-error"></i>
+          <span style="color:#8E2323">Enter a valid email!</span>
+        </div>
+      </div>
+      <!--FORM INPUT-->
+      <input id="email" type="email" class="form-control" ng-model="user_email" placeholder="Email" required />
+      <label for="email">Enter Your Email</label>
+    </div>
+
+    <div class="card-action">
+      <button class="btn waves-effect waves-light red" type="submit" name="action"
+              ng-click="cancelReset()">Cancel</button>
+      <button class="btn waves-effect waves-light green right" type="submit" name="action" 
+              ng-click="resetPass(user_email)">Reset</button>
+    </div>
+  </form>
+</div>
+</div>
+</div>
 </div>
\ No newline at end of file
diff --git a/templates/resetpassword.html b/templates/resetpassword.html
index bc7ea71..81c2f1d 100644
--- a/templates/resetpassword.html
+++ b/templates/resetpassword.html
@@ -1,30 +1,34 @@
 <div class="container">
-  <div class="row">
-    <h1>Reset Password</h1>
-  </div>
-  
-  <div class="row">
-    <form class="col s12">
-      <div class="row" ng-show="error" role="alert">
-        <i style="color:#8E2323" class="mdi-alert-error"></i>
-				<span style="color:#8E2323">Please use link from email!</span>
-      </div>
-      <div class="row">
-        <input id="newpassword" type="password" class="validate" ng-model="newPassword" placeholder="New password" required/>
-        <label for="newpassword">New password</label>
-      </div>
-      <div class="row">
-        <input id="confirmpassword" type="password" class="validate" ng-model="confirmPassword" placeholder="Confirm password" required/>
-        <label for="confirmpassword">Confirm password</label>
+<div class="row">
+<div class="offset-s2 col s8">
+<div class="card">
+  <form class="col s12" name="resetpass_form">
+    <div class="card-content">
+      <h2>Reset Password</h2>
+    </div>
+    
+    <div class="divider"></div>
+    <div class="card-content">
+      <div class="section">
+        <div ng-show="error" role="alert">
+          <i style="color:#8E2323" class="mdi-alert-error"></i>
+          <span style="color:#8E2323">Please check your reset password link!</span>
+        </div>
       </div>
-    </form>
-    <div class="row">
+      <input id="newpassword" type="password" class="validate" ng-model="newPassword" placeholder="New password" required/>
+      <label for="newpassword">Password</label>
+      <input id="confirmpassword" type="password" class="validate" ng-model="confirmPassword" placeholder="Confirm password" required/>
+      <label for="confirmpassword">Confirm password</label>
+    </div>
+    
+    <div class="card-action">
       <button class="btn waves-effect waves-light red" type="submit" name="action"
-              ng-click="cancelReset()">Cancel
-      </button>
-      <button class="btn waves-effect waves-light green" type="submit" name="action"
-              ng-click="confirmResetPass(newPassword)">Confirm
-      </button>
+              ng-click="cancelReset()">Cancel</button>
+      <button class="btn waves-effect waves-light green right" type="submit" name="action"
+              ng-click="confirmResetPass(newPassword)">Confirm</button>
     </div>
-  </div>
+  </form>
+</div>  
+</div>
+</div>
 </div>
\ No newline at end of file