diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index ac289d3..36f9c19 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -658,7 +658,7 @@ textarea.clickModify {
 }
 
 .clickModify.dropdown {
-	font-size: 2.5vh;
+	font-size: 1.2vw;
 	width: 100%;
 	border: 1px solid #999797;
 
@@ -685,7 +685,7 @@ textarea.clickModify {
 }
 
 .fa-caret-down {
-	font-size: 2.2vh;
+	font-size: 1.1vw;
 	text-align: right;
 	pointer-events: none;
 }
@@ -909,9 +909,11 @@ textarea.clickModify {
 	height: auto;
 
 	position: fixed;
-	top: 0;
-	left: 0;
+	top: 50%;
+	left: 50%;
 	z-index: -1;
+
+	transform:translate(-50%, -50%);
 }
 
 #mainBody {
@@ -1126,10 +1128,6 @@ textarea.clickModify {
 	width: 70%;
 }
 
-.inputRadioPref {
-	margin-top: 6%;
-}
-
 #workComment {
 	width: 99%;
 	margin-bottom: 3%;
@@ -1355,14 +1353,14 @@ textarea.clickModify {
 
 #userDropdownAvatar {
 	width: 100%;
-	height: 16vh;
+	height: 10vw;
 	position: relative;
 }
 
 #userDropdownAvatar img {
-	width: 9vh;
-	height: 9vh;
-	margin: -6.5vh 0 0 -5.25vh;
+	width: 6vw;
+	height: 6vw;
+	margin: -4vw 0 0 -3vw;
 
 	-moz-border-radius: 50%;
 	-webkit-border-radius: 50%;
@@ -1374,10 +1372,10 @@ textarea.clickModify {
 }
 
 #userDropdownAvatar p {
-	font-size: 2.4vh;
+	font-size: 1.2vw;
 	width: 15vw;
 	margin: 0 auto 0 auto;
-	padding-top: 12.4vh;
+	padding-top: 7.5vw;
 	text-align: center;
 }
 
@@ -1387,7 +1385,7 @@ textarea.clickModify {
 }
 
 .userFunction {
-	font-size: 2.5vh;
+	font-size: 1.1vw;
 	width: 100%;
 	background-color: rgba(255,255,255,0.3);
 	cursor: pointer;
diff --git a/hourglass/client/profile/profile.css b/hourglass/client/profile/profile.css
index 4684d67..9213e9b 100644
--- a/hourglass/client/profile/profile.css
+++ b/hourglass/client/profile/profile.css
@@ -6,7 +6,7 @@
 }
 
 .profTitle {
-	font-size: 3vh;
+	font-size: 1.5vw;
 	font-weight: 400;
 	margin: 0;
 	margin-bottom: 1%;
@@ -14,7 +14,8 @@
 }
 
 .profHea {
-	font-size: 5.5vh;
+	margin: 0;
+	font-size: 3vw;
 	font-weight: 200;
 	padding: 6% 6% 0 8%;
 }
@@ -44,10 +45,9 @@
 }
 
 #profAvatar {
-	height: 27vh;
-	width: 27vh;
+	height: 45%;
 
-	border: 10px solid #0D0D0D;
+	border: 7px solid #0D0D0D;
 	-moz-border-radius: 50%;
 	-webkit-border-radius: 50%;
 	border-radius: 50%;
@@ -58,7 +58,7 @@
 	z-index: 5;
 }
 
-#motdBox {
+#motdBox, #motdBoxuser {
 	width: 100%;
 	height: 5%;
 	margin-top: -0.5vh;
@@ -70,8 +70,13 @@
 	border-right: 5px solid #0D0D0D;
 }
 
+#motdBoxuser {
+	font-size: 1.2vw;
+	padding: 0.7% 0 0.7% 0;
+}
+
 #motdBox span {
-	font-size: 130% !important;
+	font-size: 1.5vw !important;
 	margin: 0;
 	color: #FFF;
 }
@@ -80,6 +85,10 @@
 	width: 50% !important;
 }
 
+#description {
+	font-size: 1.5vw;
+}
+
 #description:hover {
 	background-color: rgba(255,255,255,0.1);
 }
@@ -173,9 +182,9 @@
 }
 
 .profFunction {
-	font-size: 1.7vh;
+	font-size: 1.2vw;
 	margin-right: 1%;
-	padding: 2%;
+	padding: 0.7vw;
 
 	border: 2px solid rgba(0,0,0,0.2);
 
@@ -195,10 +204,7 @@
 
 .profFunction i, .profFunction h4 {
 	padding: 1% !important;
-}
-
-.profFunction h4 {
-	font-size: 120% !important;
+	font-size: 1.2vw !important;
 }
 
 #searchBar {
@@ -206,10 +212,10 @@
 }
 
 #profClassSearch {
-	font-size: 125%;
+	font-size: 1.5vw;
 	width: 30%;
 	margin-top: 3%;
-	padding: 1.5% 1% 1.5% 1%;
+	padding: 1%;
 
 	-webkit-animation: expand .7s ease 1;
     animation: expand .7s ease 1;
@@ -264,7 +270,7 @@
 }
 
 .classBox {
-	font-size: 2.7vh;
+	font-size: 1.3vw;
 	width: 94%;
 	margin-bottom: 3%;
 	padding: 2%;
@@ -286,11 +292,12 @@
 }
 
 #joinTop .fa-search {
-	font-size: 2.5vh;
+	font-size: 1.3vw;
 	margin-right: 3%;
 }
 
 #private {
+	font-size: 1.5vw;
 	margin-left: 5%;
 	padding: 1.5%;
 
@@ -397,7 +404,7 @@
 
 #creSubmit {
 	font-weight: 200;
-	font-size: 3vh;
+	font-size: 1.5vw;
 	width: 13vw;
 	margin: auto;
 	padding: 2%;
@@ -425,9 +432,9 @@
 }
 
 #mainpage, #logout2 {
-	font-size: 1.5vh;
+	font-size: 1vw;
 	margin: 0;
-	padding: 0.7%;
+	padding: 0.8%;
 	background-color: #617C9E;
 
 	box-shadow: -1px 2px 5px 1px #333;
@@ -463,6 +470,7 @@
 #mainpage h2, #logout2 h2 {
 	font-weight: 200;
 	width: 100%;
+	margin: 0;
 
 	-webkit-filter: none;
 	filter: none !important;
diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html
index 2cefef0..3fc084e 100644
--- a/hourglass/client/profile/profile.html
+++ b/hourglass/client/profile/profile.html
@@ -53,7 +53,7 @@
 								<h3 class="profHea">Preferences</h3>
 								<div id="preferences">
 						            <div class="prefWrapper">
-					                    <p class="prefTitle">Theme:</p>
+					                    <p class="profTitle">Theme:</p>
 					                    <div id="theme" class="clickModify dropdown" tabindex="3">
 					                        <span>{{pref 'theme'}}</span>
 					                        <i class="fa fa-caret-down" aria-hidden="true"></i>
@@ -64,8 +64,9 @@
 					                        {{/each}}
 					                    </div>
 					                </div>
+					                <br>
 					                <div class="prefWrapper">
-					                    <p class="prefTitle">Default Mode:</p>
+					                    <p class="profTitle">Default Mode:</p>
 					                    <div id="mode" class="clickModify dropdown" tabindex="4">
 					                        <span>{{pref 'mode'}}</span>
 					                        <i class="fa fa-caret-down" aria-hidden="true"></i>
@@ -76,8 +77,9 @@
 					                        {{/each}}
 					                    </div>
 					                </div>
+					                <br>
 					                <div class="prefWrapper">
-					                    <p class="prefTitle">Hide Homework:</p>
+					                    <p class="profTitle">Hide Homework:</p>
 					                    <div id="timeHide" class="clickModify dropdown" tabindex="5">
 					                        <span>{{pref 'timeHide'}}</span>
 					                        <i class="fa fa-caret-down" aria-hidden="true"></i>
@@ -88,8 +90,9 @@
 					                        {{/each}}
 					                    </div>
 					                </div>
+					                <br>
 					                <div class="prefWrapper">
-					                    <p class="prefTitle">Hide Done:</p>
+					                    <p class="profTitle">Hide Done:</p>
 					                    <div id="done" class="clickModify dropdown" tabindex="6">
 					                        <span>{{pref 'done'}}</span>
 					                        <i class="fa fa-caret-down" aria-hidden="true"></i>
@@ -100,8 +103,9 @@
 					                        {{/each}}
 					                    </div>
 					                </div>
+					                <br>
 					                <div class="prefWrapper">
-					                    <p class="prefTitle">Hide Reported:</p>
+					                    <p class="profTitle">Hide Reported:</p>
 					                    <div id="hideReport" class="clickModify dropdown" tabindex="7">
 					                        <span>{{pref 'hideReport'}}</span>
 					                        <i class="fa fa-caret-down" aria-hidden="true"></i>
diff --git a/hourglass/lib/router.js b/hourglass/lib/router.js
index 46c9257..fb68ab6 100644
--- a/hourglass/lib/router.js
+++ b/hourglass/lib/router.js
@@ -1,9 +1,6 @@
 Router.route('/', {
-    data: function() {
-        return false;
-    },
     waitOn: function() {
-        if (!Meteor.userId() || _.contains([null, undefined, ""], Meteor.user().profile.school)) {
+        if (!Meteor.userId()) {
             this.redirect('/login');
         } else {
             return [
@@ -16,14 +13,15 @@ Router.route('/', {
         }
     },
     action: function() {
-        this.render("main");
+        if(_.contains([null, undefined, ""], Meteor.user().profile.school)) {
+            this.redirect('/login');
+        } else {
+            this.render("main");
+        }
     }
 });
 
 Router.route('/login', {
-    data: function() {
-        return false;
-    },
     action:  function() {
         if (!Meteor.userId()) {
             this.render("login");
@@ -36,9 +34,6 @@ Router.route('/login', {
 });
 
 Router.route('/profile', {
-    data: function() {
-        return false;
-    },
     waitOn: function() {
         if (!Meteor.userId()) {
             this.redirect('/login');