diff --git a/Makefile b/Makefile
index 33dbd66..a4ccf7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,7 @@
 styles/materialize.css: .PHONY
 	sassc materialize/sass/materialize.scss > styles/materialize.css
 
+fixjsstyle:
+	fixjsstyle --flagfile gjslint.conf config.js scripts/*{Controller,Directive,Service}.js
+
 .PHONY:
diff --git a/config.js b/config.js
index 4c166d0..6dde881 100644
--- a/config.js
+++ b/config.js
@@ -14,13 +14,21 @@ angular.module('flashy', [
     'ngCookies']).
     config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
         '$locationProvider',
-        function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
+        function($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
             'use strict';
             $httpProvider.defaults.withCredentials = true;
             $httpProvider.defaults.xsrfCookieName = 'csrftoken';
             $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
             $locationProvider.html5Mode(true);
             $urlRouterProvider.otherwise('/home');
+            var auth_resolve = {
+                authorize: ['$q', 'UserService',
+                    function($q, UserService) {
+                        console.log('resolving user before continuing');
+                        return UserService.getUserData();
+                    }
+                ]
+            };
             $stateProvider.
                 state('login', {
                     url: '/login',
@@ -28,78 +36,78 @@ angular.module('flashy', [
                     controller: 'LoginController'
                 }).
                 state('logout', {
+                    resolve: auth_resolve,
                     url: '/logout',
                     templateUrl: 'templates/logout.html',
                     controller: 'LogoutController'
                 }).
                 state('root', {
+                    resolve: auth_resolve,
                     url: '/',
                     templateUrl: 'templates/root.html',
-                    controller: 'RootController',
-                    resolve: {
-                        authorize: ['UserService',
-                            function (UserService) {
-                                return UserService.getUserData();
-                            }
-                        ]
-                    }
-
+                    controller: 'RootController'
                 }).
                 state('feed', {
+                    resolve: auth_resolve,
                     url: '/feed',
                     templateUrl: 'templates/feed.html',
-                    controller: 'FeedController',
-                    resolve: {
-                        authorize: ['UserService',
-                            function (UserService) {
-                                return UserService.getUserData();
-                            }
-                        ]
-                    }
+                    controller: 'FeedController'
                 }).
                 state('addclass', {
+                    resolve: auth_resolve,
                     url: '/addclass',
                     templateUrl: 'templates/addclass.html',
                     controller: 'ClassAddController'
                 }).
                 state('deck', {
+                    resolve: auth_resolve,
                     url: '/deck',
                     templateUrl: 'templates/deck.html',
                     controller: 'DeckController'
                 }).
                 state('study', {
+                    resolve: auth_resolve,
                     url: '/study',
                     templateUrl: 'templates/study.html',
                     controller: 'StudyController'
                 }).
                 state('flashcard', {
+                    resolve: auth_resolve,
                     url: '/flashcard',
                     templateUrl: 'templates/flashcard.html',
                     controller: 'FlashcardController'
                 }).
                 state('requestpasswordreset', {
+                    resolve: auth_resolve,
                     url: '/requestpasswordreset',
                     templateUrl: 'templates/requestpasswordreset.html',
                     controller: 'RequestResetController'
                 }).
                 state('resetpassword', {
+                    resolve: auth_resolve,
                     url: '/resetpassword/{uid}/{token}',
                     templateUrl: 'templates/resetpassword.html',
                     controller: 'ResetPasswordController'
                 }).
                 state('verifyemail', {
+                    resolve: auth_resolve,
                     url: '/verifyemail/{key}',
                     templateUrl: 'templates/verifyemail.html',
                     controller: 'VerifyEmailController'
                 });
         }]).run(['$rootScope', '$state', '$stateParams', '$location', 'UserService',
-        function ($rootScope, $state, $stateParams, $location, UserService) {
-            $rootScope.$on('$stateChangeStart', function (event, toState, toStateParams) {
+        function($rootScope, $state, $stateParams, $location, UserService) {
+            $rootScope.$on('$stateChangeStart', function(event, toState, toStateParams) {
+                if (UserService.isLoggedIn()) return console.log('no login required; going straight to ' + toState.name);
+                if (toState.name == 'login') return;
+                if (!UserService.isUserResolved()) return;
                 $rootScope.returnToState = toState;
                 $rootScope.returnToStateParams = toStateParams;
-                console.log('going to' + toState.name);
-                console.log(UserService.isLoggedIn());
-                if (!UserService.isLoggedIn() && toState.name != 'login') $location.path('login');
+                console.log('going to ' + toState.name + ' after login');
+                $state.go('login');
+            });
+            $rootScope.$on('$routeChangeError', function() {
+                console.log('failed to change routes');
             });
         }
     ]);
diff --git a/flashy.css b/flashy.css
index 6931474..00e5f26 100644
--- a/flashy.css
+++ b/flashy.css
@@ -27,70 +27,98 @@
 }
 
 .angucomplete-selected-row {
-    background-color:#aaaaff;
+    background-color: #aaaaff;
 }
 
-
 .container .row {
-  margin-left: 0;
-  margin-right: 0;
+    margin-left: 0;
+    margin-right: 0;
+}
+
+ul.side-nav.fixed li {
+    /*line-height: 30px;*/
+    /*font-weight:700;*/
+    font-size:24px;
 }
 
+ul.side-nav.fixed li a {
+    /*line-height: 30px;*/
+    /*font-weight:700;*/
+    font-size:24px;
+}
+
+
+ul.side-nav.fixed li ul li {
+    /*line-height: 30px;*/
+    /*font-weight:700;*/
+    margin-left:20px;
+}
+
+ul.side-nav.fixed li a {
+    /*line-height: 30px;*/
+    /*font-weight:700;*/
+    font-size:24px;
+}
+
+
+#logo-container{
+    height:110px;
+}
 /* Flashcard directive css */
 .card.fixed-size {
-  height: calc(3*5vw);
-  min-height: calc(3*50px);
-  min-width: calc(5*50px);
-  width: calc(5*5vw);
+    height: calc(3 * 5vw);
+    min-height: calc(3 * 50px);
+    min-width: calc(5 * 50px);
+    width: calc(5 * 5vw);
 }
 
 .card-overlay {
-/*  display: none; */
-  height: calc(3*5vw);
-  left: 0;
-  min-height: calc(3*50px);
-  min-width: calc(5*50px);
-  position: absolute;
-  top: 0;
-  width: calc(5*5vw);
+    /*  display: none; */
+    height: calc(3 * 5vw);
+    left: 0;
+    min-height: calc(3 * 50px);
+    min-width: calc(5 * 50px);
+    position: absolute;
+    top: 0;
+    width: calc(5 * 5vw);
 }
 
 .card-overlay i {
-  color: #FFF;
+    color: #FFF;
 }
 
 .card:hover .card-overlay {
-  display: block;
+    display: block;
 }
 
 .top-box {
-  background-color: rgba(50,50,90,0.5);
-  height: 50%;
-  position: relative;
-  width: 100%;
+    background-color: rgba(50, 50, 90, 0.5);
+    height: 50%;
+    position: relative;
+    width: 100%;
 }
 
 .bottom-box {
-  height: 50%;
-  position: relative;
-  width: 100%;
+    height: 50%;
+    position: relative;
+    width: 100%;
 }
 
 .left-box {
-  background-color: rgba(90,50,190,0.5);
-  float: left;
-  position: relative;
-  width: 50%;
+    background-color: rgba(90, 50, 190, 0.5);
+    float: left;
+    position: relative;
+    width: 50%;
 }
 
 .right-box {
-  background-color: rgba(190,50,90,0.5);
-  float: right;
-  width: 50%;
+    background-color: rgba(190, 50, 90, 0.5);
+    float: right;
+    width: 50%;
 }
 
 .center-me {
-  margin: 0 auto;
+    margin: 0 auto;
 }
 
 .container {
@@ -108,64 +136,64 @@
 
 /* label color */
 .input-field label {
-	color: #673ab7;
+    color: #673ab7;
 }
 
 /* label focus color */
 .input-field input[type]:focus + label {
-	color: #b388ff;
+    color: #b388ff;
 }
 
 /* label underline focus color */
 .input-field input[type]:focus {
-	border-bottom: 1px solid #b388ff;
-	box-shadow: 0 1px 0 0 #b388ff;
+    border-bottom: 1px solid #b388ff;
+    box-shadow: 0 1px 0 0 #b388ff;
 }
 
 /* valid color */
 .input-field input[type].valid {
-	border-bottom: 1px solid #673ab7;
-	box-shadow: 0 1px 0 0 #673ab7;
+    border-bottom: 1px solid #673ab7;
+    box-shadow: 0 1px 0 0 #673ab7;
 }
 
 /* invalid color */
 .input-field input[type].invalid {
-	border-bottom: 1px solid #673ab7;
-	box-shadow: 0 1px 0 0 #673ab7;
+    border-bottom: 1px solid #673ab7;
+    box-shadow: 0 1px 0 0 #673ab7;
 }
 
 /* icon prefix focus color */
 .input-field .prefix.active {
-	color: #b388ff;
+    color: #b388ff;
 }
 
 /* label focus color */
 .input-field textarea[type]:focus + label {
-	color: #b388ff;
+    color: #b388ff;
 }
 
 /* label underline focus color */
 .input-field textarea[type]:focus {
-	border-bottom: 1px solid #b388ff;
-	box-shadow: 0 1px 0 0 #b388ff;
+    border-bottom: 1px solid #b388ff;
+    box-shadow: 0 1px 0 0 #b388ff;
 }
 
 body {
-	background-color: #3e1944;
+    background-color: #3e1944;
 }
 
 .btn {
-	background-color: #673ab7;
+    background-color: #673ab7;
 }
 
 .btn:hover {
-	background-color: #7c4dff;
+    background-color: #7c4dff;
 }
 
 .btn-floating {
-	background-color: #673ab7;
+    background-color: #673ab7;
 }
 
 .btn-floating:hover {
-	background-color: #7c4dff;
+    background-color: #7c4dff;
 }
diff --git a/gjslint.conf b/gjslint.conf
index b106210..b1a8d11 100644
--- a/gjslint.conf
+++ b/gjslint.conf
@@ -1 +1 @@
---summary
\ No newline at end of file
+--max_line_length=140
diff --git a/home.html b/home.html
index 16249d7..c18d2e9 100644
--- a/home.html
+++ b/home.html
@@ -2,39 +2,40 @@
 <html ng-app="flashy">
 <base href="/app/">
 <head>
-  <link type="text/css" rel="stylesheet" href="styles/materialize.min.css" media="screen,projection"/>
+  <link type="text/css" rel="stylesheet" href="styles/materialize.min.css"
+        media="screen,projection"/>
   <!--<link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css"/>-->
-  <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.css">
+  <link rel="stylesheet"
+        href="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.css">
 
   <link rel="stylesheet" href="flashy.css"/>
 </head>
 
 <body ng-controller="RootController">
 
-<ul ng-show="UserService.isLoggedIn()" id="slide-out" class="side-nav fixed">
-	<ul class="collapsible collapsible-accordion">
-		<div class = "top">
-			<li id = "sidebar">		
-				<a class="collapsible-header waves-effect waves-teal active">
-		    	Flashy
-				</a>
-
-				<div class ="collapsible-body" style="display: block;">
-					<ul>
-						<li class="bold"><a ui-sref="login">Login</a></li>
-						<li class="bold"><a ui-sref="addclass">Add Class</a></li>
-						<li class="bold"><a ui-sref="feed">Feed</a></li>
-						<li class="bold"><a ui-sref="deck">Deck</a></li>
-            <li class="bold"><a ui-sref="logout">Logout</a></li>
-					</ul>
-		  	</div>
-		  </li>
-
-		</div>
-	</ul>
-  
+<ul id="slide-out" class="side-nav fixed">
+  <li class="logo"><a href="//flashy.cards/" id="logo-container">
+    <h1>Flashy</h1>
+  </a></li>
+  <li class="bold">
+    <a>Classes</a>
+    <!--<a ui-sref="addclass"><i class="mdi-content-add"></i></a>-->
+  </li>
+  <li>
+    <ul>
+      <li ui-sref="feed">WRONG 123</li>
+      <li ui-sref="feed/4567">CSE 1337</li>
+      <li ui-sref="feed/1242">MATH 20Z</li>
+      <li ui-sref="feed/2842">BILD 99</li>
+    </ul>
+  </li>
+  <li class="bold"><a ui-sref="addclass">Add Class</a></li>
+  <li class="bold"><a ui-sref="feed">Feed</a></li>
+  <li class="bold"><a ui-sref="deck">Deck</a></li>
+  <li class="bold"><a ui-sref="logout">Logout</a></li>
 </ul>
 
+
 <div class="container" ui-view></div>
 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script>
diff --git a/scripts/FlashcardDirective.js b/scripts/FlashcardDirective.js
index c69effd..1c85c94 100644
--- a/scripts/FlashcardDirective.js
+++ b/scripts/FlashcardDirective.js
@@ -5,7 +5,7 @@ directive('flashcard', function() {
         templateUrl: '/app/templates/flashcard.html',
         restrict: 'E',
         link: function() {
-            console.log("HELLO FROM FLASHCARD DIRECTIVE");
+            console.log('HELLO FROM FLASHCARD DIRECTIVE');
         }
     };
 });
diff --git a/scripts/LoginController.js b/scripts/LoginController.js
index d2c0f88..dba645d 100644
--- a/scripts/LoginController.js
+++ b/scripts/LoginController.js
@@ -1,9 +1,10 @@
 angular.module('flashy.LoginController', ['ui.router']).
 
-    controller('LoginController', ['$scope', '$state', '$http', 'UserService',
-        function($scope, $state, $http, UserService) {
+    controller('LoginController', ['$rootScope', '$scope', '$state', '$http', 'UserService',
+        function($rootScope, $scope, $state, $http, UserService) {
             'use strict';
-            if (UserService.isLoggedIn()) state.go('/addclass');
+            // If we're logged in, there's nothing to do here
+            if (UserService.isLoggedIn()) $state.go('addclass');
             $scope.uniqueError = false;
             $scope.loginError = false;
             $scope.login = function(email, password) {
@@ -13,7 +14,9 @@ angular.module('flashy.LoginController', ['ui.router']).
                 })).
                     success(function(data) {
                         UserService.setUserData(data);
-                        $state.go('feed');
+                        if (angular.isDefined($scope.returnToState))
+                            $state.go($scope.returnToState.name, $scope.returnToStateParams);
+                        else $state.go('addclass');
                         console.log(data);
                     }).
                     error(function(data, status, header, config) {
@@ -29,7 +32,7 @@ angular.module('flashy.LoginController', ['ui.router']).
                     'password': password
                 })).
                     success(function(data) {
-                        $state.go('feed');
+                        $state.go($rootScope.returnToState);
                         console.log(data);
                     }).
                     error(function(data, status, headers, config) {
diff --git a/scripts/LogoutController.js b/scripts/LogoutController.js
index 0e81e08..d1bcb5d 100644
--- a/scripts/LogoutController.js
+++ b/scripts/LogoutController.js
@@ -1,7 +1,8 @@
 angular.module('flashy.LogoutController', ['ui.router']).
-    controller('LogoutController', ['$scope', '$state', '$http', '$timeout',
-        function($scope, $state, $http, $timeout) {
+    controller('LogoutController', ['$scope', '$state', '$http', '$timeout', 'UserService',
+        function($scope, $state, $http, $timeout, UserService) {
             $http.post('/api/logout/').success(function() {
+                UserService.logout();
                 $timeout(function() {
                     $state.go('login');
                 }, 1000);
diff --git a/scripts/RootController.js b/scripts/RootController.js
index 4397bdd..d22ac6e 100644
--- a/scripts/RootController.js
+++ b/scripts/RootController.js
@@ -1,8 +1,8 @@
 angular.module('flashy.RootController', ['ui.router']).
 
-    controller('RootController', ['$scope', '$state', 'UserService', function($scope, $state, UserService) {
+    controller('RootController', ['$rootScope', '$scope', '$state', 'UserService', function($rootScope, $scope, $state, UserService) {
         //UserService.getUserData();
-        $('#top').collapsible('accordion');
-        //if (UserService.isLoggedIn()) $state.go('login');
-        //else $state.go('addclass');
+        //$('#top').collapsible('accordion');
+        if (UserService.isLoggedIn()) $state.go('login');
+        else $state.go('addclass');
     }]);
diff --git a/scripts/UserService.js b/scripts/UserService.js
index da5baa4..1e3a522 100644
--- a/scripts/UserService.js
+++ b/scripts/UserService.js
@@ -1,25 +1,37 @@
 angular.module('flashy.UserService', ['ui.router']).
-    service('UserService', function ($http, $q) {
+    service('UserService', function($rootScope, $http, $q) {
         var _user = undefined;
-        this.getUserData = function () {
+        this.getUserData = function() {
             var deferred = $q.defer();
             if (angular.isDefined(_user)) {
+                console.log('user is already defined: ' + _user);
+                if (!_user) deferred.reject(_user);
                 deferred.resolve(_user);
                 return deferred.promise;
             }
-            $http.get('/api/me/').success(function (data) {
-                console.log('user is logged in!')
+            $http.get('/api/me/').success(function(data) {
+                console.log('user is logged in!');
+                _user = data;
                 deferred.resolve(data);
-            }).error(function () {
+            }).error(function(data) {
                 deferred.reject('error getting own data');
-                console.log(deferred);
+                _user = false;
+                console.log(data);
             });
             return deferred.promise;
         };
-        this.setUserData = function(data){
+        this.setUserData = function(data) {
             _user = data;
-        }
-        this.isLoggedIn = function () {
-            return !(!angular.isDefined(_user) && !_user);
+        };
+        this.isUserResolved = function() {
+            return angular.isDefined(_user);
+        };
+        this.logout = function() {
+            _user = undefined;
+        };
+        this.isLoggedIn = function() {
+            rv = this.isUserResolved() && _user;
+            console.log('is user logged in? ' + rv);
+            return rv;
         };
     });
diff --git a/templates/addclass.html b/templates/addclass.html
index bc32b29..982479c 100644
--- a/templates/addclass.html
+++ b/templates/addclass.html
@@ -14,8 +14,12 @@
                   >
             <md-item-template>
               <div layout="row">
-                <div>{{item.short_name}}: {{item.course_title}} ({{item.instructor}})</div>
-                <div style="margin-left:auto;text-align:right;padding-left:30px">{{item.lecture_times}}</div>
+                <div>{{item.short_name}}: {{item.course_title}}
+                  ({{item.instructor}})
+                </div>
+                <div style="margin-left:auto;text-align:right;padding-left:30px">
+                  {{item.lecture_times}}
+                </div>
               </div>
             </md-item-template>
             <md-not-found>
diff --git a/templates/login.html b/templates/login.html
index 8b60083..e58b70b 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,58 +1,60 @@
 <div class="row">
-<div class="offset-s2 col s8">
+  <div class="offset-s2 col s8">
     <ul class="tabs">
       <li class="tab col s6"><a href="#register-tab">Sign Up</a></li>
       <li class="tab col s6"><a class="active" href="#login-tab">Login</a></li>
     </ul>
-</div>
+  </div>
 </div>
 <div class="row">
-<div class="offset-s2 col s8">
-<div class="card">
-    <!--LOGIN TAB-->
-    <div id="login-tab" class="row col s12">
-      <div class="card-content">
-        <div class="check-element animate-show" role="alert" ng-show="loginError">
-          <span style="color:#8E2323">Invalid username or password!!</span>
-        </div>
-        <div class="input-field">
-          <input id="email" type="email" class="validate" ng-model="loginEmail" required/>
-          <label for="email">Email</label>
+  <div class="offset-s2 col s8">
+    <div class="card">
+      <!--LOGIN TAB-->
+      <div id="login-tab" class="row col s12">
+        <div class="card-content">
+          <div class="check-element animate-show" role="alert" ng-show="loginError">
+            <span style="color:#8E2323">Invalid username or password!!</span>
+          </div>
+          <div class="input-field">
+            <input id="email" type="email" name="login" class="validate" ng-model="loginEmail" required/>
+            <label for="email">Email</label>
+          </div>
+          <div class="input-field">
+            <input id="password" type="password" name="password" class="validate" ng-model="loginPassword" required/>
+            <label for="password">Password</label>
+          </div>
         </div>
-        <div class="input-field">
-          <input id="password" type="password" class="validate" ng-model="loginPassword" required/>
-          <label for="password">Password</label>
+        <div class="card-action">
+          <button class="btn waves-effect waves-light col s12 blue lighten-1" type="submit" name="action"
+                  ng-click="login(loginEmail, loginPassword)">Login
+          </button>
         </div>
       </div>
-      <div class="card-action">
-        <button class="btn waves-effect waves-light col s12 blue lighten-1" type="submit" name="action"
-            ng-click="login(loginEmail, loginPassword)">Login</button>
-      </div>
-    </div>
-    <!--REGISTER TAB-->
-    <div id="register-tab" class="row col s12">
-      <div class="card-content">
-        <div class="check-element animate-show" role="alert" ng-show="uniqueError">
-          <span style="color:#8E2323">Invalid username or password!!</span>
+      <!--REGISTER TAB-->
+      <div id="register-tab" class="row col s12">
+        <div class="card-content">
+          <div class="check-element animate-show" role="alert" ng-show="uniqueError">
+            <span style="color:#8E2323">Invalid username or password!!</span>
+          </div>
+          <div class="input-field">
+            <input id="email" type="email" class="validate" ng-model="loginEmail" required/>
+            <label for="email">Email</label>
+          </div>
+          <div class="input-field">
+            <input type="password" class="validate" ng-model="registerPassword" required/>
+            <label for="password">Password</label>
+          </div>
         </div>
-        <div class="input-field">
-          <input id="email" type="email" class="validate" ng-model="loginEmail" required/>
-          <label for="email">Email</label>
-        </div>
-        <div class="input-field">
-          <input type="password" class="validate" ng-model="registerPassword" required/>
-          <label for="password">Password</label>
+        <div class="card-action">
+          <button class="btn waves-effect waves-light col s12 blue lighten-1" type="" name="action"
+                  ng-click="signUp(loginEmail, registerPassword)">Register
+          </button>
         </div>
       </div>
-      <div class="card-action">
-        <button class="btn waves-effect waves-light col s12 blue lighten-1" type="" name="action"
-                ng-click="signUp(loginEmail, registerPassword)">Register</button>
+
+      <div class="row offset-s1 col s12">
+        <a class="trigger-password-reset" ng-click="triggerPasswordReset()" href="#">Forgot Password?</a>
       </div>
     </div>
-    
-    <div class="row offset-s1 col s12">
-      <a class="trigger-password-reset" ng-click="triggerPasswordReset()" href="#">Forgot Password?</a>
-    </div>
-</div>
-</div>
+  </div>
 </div>