diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css
index 410e8d1..dfc4adc 100644
--- a/hourglass/client/login/login.css
+++ b/hourglass/client/login/login.css
@@ -88,8 +88,7 @@
 	width: 80%;
 	margin: auto;
 	padding-top: 16vh;
-  background-color: rgba(0, 0, 0, 0.2);
-  padding-bottom: 4vh;
+  	padding-bottom: 4vh;
 }
 
 .text {
diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html
index f9e5fec..cf868b0 100644
--- a/hourglass/client/profile/profile.html
+++ b/hourglass/client/profile/profile.html
@@ -1,6 +1,6 @@
 <template name="profile">
 	<div class="noScroll">
-		<div id="mainpage{{userProfile}}" onclick="window.location='/'"><h2>Main Page</h2></div>
+		<div id="mainpage{{userProfile}}"><h2>Main Page</h2></div>
 		<div id="logout2" onclick='document.getElementById("login-buttons-logout").click();'><h2>Logout</h2></div>
 		<div id="profWrapper">
 			<div id="profPage" style="background-color:{{divColor 'mainColor'}};min-width:{{screen}}{{textColor}}{{loadNew}}">
diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js
index 2710ecb..109ee54 100644
--- a/hourglass/client/profile/profile.js
+++ b/hourglass/client/profile/profile.js
@@ -202,6 +202,13 @@ Template.profile.events({
         }
     },
     // MAIN BUTTONS
+    'click #mainpage' () {
+        if (!Meteor.userId() || _.contains([null, undefined, ""], Meteor.user().profile.school)) {
+            alert("Please fill in your profile!");
+        } else {
+            window.location = '/';
+        }
+    },
     'click .addClass' () { 
         if(Session.equals("profClassTab","addClass")) return;         
         var functionHolder = document.getElementById("profClassInfoHolder");