diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css
index c8497dd..4e12108 100644
--- a/hourglass/client/login/login.css
+++ b/hourglass/client/login/login.css
@@ -1,134 +1,151 @@
 #loginHeader {
-    font-weight: 600;
-    width: 100%;
-    margin: 0;
-    box-shadow: 2px 2px 5px 3px #666;
-    background-color: #EBEBEB;
-    display: inline-block;
-    position: relative;
-    z-index: 50;
+	font-weight: 600;
+	width: 100%;
+	margin: 0;
+	box-shadow: 2px 2px 5px 3px #666;
+
+	background-color: #EBEBEB;
+
+	display: inline-block;
+	position: relative;
+	z-index: 50;
 }
 
 #logo {
-    padding: 0.5%;
-    padding-left: 1%;
-    float: left;
-    -webkit-filter: drop-shadow(2px 2px 5px #333);
-    filter: drop-shadow(2px 2px 5px #333);
+	padding: 0.5%;
+	padding-left: 1%;
+	float: left;
+
+	-webkit-filter: drop-shadow(2px 2px 5px #333);
+	filter: drop-shadow(2px 2px 5px #333);
 }
 
 #banner {
-    height: 100%;
-    position: relative;
+	height: 100%;
+	position: relative;
 }
 
 #loginTitle {
-    font-size: 255%;
-    padding: 1.4%;
-    padding-left: 1%;
+	font-size: 255%;
+	padding: 1.4%;
+	padding-left: 1%;
 }
 
 #loginMain {
-    width: 100%;
-    min-height: 100%;
-    position: absolute;
-    top: 11%;
-    background-color: #E5E5E5;
-    background-image: url("banner100.jpg");
+	width: 100%;
+	min-height: 100%;
+	position: absolute;
+	top: 11%;
+
+	background-color: #E5E5E5;
+	background-image: url("banner100.jpg");
 }
 
 #circle {
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    -moz-border-radius: 50%;
-    -webkit-border-radius: 50%;
-    border-radius: 50%;
-    background-color: rgba(0, 0, 0, 0.2);
-    -webkit-filter: drop-shadow(2px 2px 5px #333);
-    filter: drop-shadow(2px 2px 5px #333);
+	position: fixed;
+	top: 50%;
+	left: 50%;
+
+	-moz-border-radius: 50%;
+	-webkit-border-radius: 50%;
+	border-radius: 50%;
+
+	background-color: rgba(0,0,0,0.2);
+
+	-webkit-filter: drop-shadow(2px 2px 5px #333);
+	filter: drop-shadow(2px 2px 5px #333);
 }
 
 #loginContent {
-    position: fixed;
-    top: 50%;
-    left: 50%;
+	position: fixed;
+	top: 50%;
+	left: 50%;
 }
 
 .text {
-    text-align: center;
-    color: #FFF;
-    -webkit-filter: drop-shadow(2px 2px 5px #444);
-    filter: drop-shadow(2px 2px 5px #444);
+	text-align: center;
+	color: #FFF;
+
+	-webkit-filter: drop-shadow(2px 2px 5px #444);
+	filter: drop-shadow(2px 2px 5px #444);
 }
 
 h2.text {
-    font-size: 400%;
-    padding-bottom: 2%;
-    border-bottom: 1px solid #FEFEFE;
+	font-size: 400%;
+	padding-bottom: 2%;
+	border-bottom: 1px solid #FEFEFE;
 }
 
 p.text {
-    font-size: 150%;
-    margin-bottom: 5%;
+	font-size: 150%;
+	margin-bottom: 5%;
 }
 
 #loginButton {
-    font-size: 200%;
-    padding: 2%;
-    -webkit-border-radius: 6;
-    -moz-border-radius: 6;
-    border-radius: 6px;
-    position: relative;
-    background-color: #005CE6;
-    -webkit-transition: background-color 0.4s ease;
-    -moz-transition: background-color 0.4s ease;
-    -ms-transition: background-color 0.4s ease;
-    transition: background-color 0.4s ease;
-    cursor: pointer;
+	font-size: 200%;
+	padding: 2%;
+
+	-webkit-border-radius: 6;
+	-moz-border-radius: 6;
+	border-radius: 6px;
+
+	position: relative;
+
+	background-color: #005CE6;
+
+	-webkit-transition: background-color 0.4s ease;  
+	-moz-transition: background-color 0.4s ease; 
+	-ms-transition: background-color 0.4s ease;
+	transition: background-color 0.4s ease; 
+
+	cursor: pointer;
 }
 
 #loginButton:hover {
-    background-color: #0066FF;
+	background-color: #0066FF;
 }
 
 #loginButton:active {
-    background-color: #FF4D4D;
-    -webkit-transition: background-color 0.1s ease;
-    -moz-transition: background-color 0.1s ease;
-    -ms-transition: background-color 0.1s ease;
-    transition: background-color 0.1s ease;
+	background-color: #FF4D4D;
+
+	-webkit-transition: background-color 0.1s ease;  
+	-moz-transition: background-color 0.1s ease; 
+	-ms-transition: background-color 0.1s ease;
+	transition: background-color 0.1s ease; 
 }
 
 #loginFooter {
-    width: 100%;
-    box-shadow: 2px 2px 5px 3px #666;
-    background-color: #EBEBEB;
-    position: absolute;
-    bottom: 0;
+	width: 100%;
+	box-shadow: 2px 2px 5px 3px #666;
+	background-color: #EBEBEB;
+	position: absolute;
+	bottom: 0;
 }
 
 .login-button {
-    display: none !important;
+	display: none !important;
 }
 
 #github {
-    font-size: 150%;
-    margin: 0;
-    padding: 1%;
-    -webkit-filter: drop-shadow(2px 2px 5px #444);
-    filter: drop-shadow(2px 2px 5px #444);
+	font-size: 150%;
+	margin: 0;
+	padding: 1%;
+
+	-webkit-filter: drop-shadow(2px 2px 5px #444);
+	filter: drop-shadow(2px 2px 5px #444);
 }
 
 a {
-    color: #0099CC;
-    text-decoration: none;
-    -webkit-transition: color 0.4s ease;
-    -moz-transition: color 0.4s ease;
-    -ms-transition: color 0.4s ease;
-    transition: color 0.4s ease
+	color: #0099CC;
+	text-decoration: none;
+
+	-webkit-transition: color 0.4s ease;  
+	-moz-transition: color 0.4s ease; 
+	-ms-transition: color 0.4s ease;
+	transition: color 0.4s ease
 }
 
 a:hover {
-    color: #00BFFF;
-}
\ No newline at end of file
+	color: #00BFFF;
+}
+
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index ba25972..f4ae2fc 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -22,12 +22,14 @@ var themeColors = {
 
     }
 };
+
 var calendarColors = {
     "test": "red",
     "project": "blue",
     "normal": "green",
     "quiz": "black"
 };
+
 var options = {
     "privacy": ["Public", "Hidden"],
     "category": ["Class", "Club", "Other"]
diff --git a/hourglass/client/profile/profile.css b/hourglass/client/profile/profile.css
index 46de61b..95860fc 100644
--- a/hourglass/client/profile/profile.css
+++ b/hourglass/client/profile/profile.css
@@ -1,356 +1,374 @@
 .change {
-    font-size: 150%;
-    color: #8C8C8C;
-    cursor: pointer;
+	font-size: 150%;
+	color: #8C8C8C;
+	cursor: pointer;
 }
 
 .radio {
-    cursor: pointer;
+	cursor: pointer;
 }
 
 .changeInput {
-    font-size: 100%;
-    padding: 0;
-    color: #8C8C8C;
-    position: relative;
+	font-size: 100%;
+	padding: 0;
+	color: #8C8C8C;
+	position: relative;
 }
 
 .profTitle {
-    font-size: 150%;
-    font-weight: 400;
-    margin: 0;
-    margin-bottom: 1%;
+	font-size: 150%;
+	font-weight: 400;
+	margin: 0;
+	margin-bottom: 1%;
 }
 
 .profHea {
-    font-size: 300%;
-    font-weight: 200;
+	font-size: 300%;
+	font-weight: 200;
 }
 
 #motda {
-    font-size: 100%;
-    width: 30% !important;
+	font-size: 100%;
+	width: 30% !important;
 }
 
 #profPage {
-    width: 100%;
-    padding-right: 10%;
-    overflow-x: hidden;
-    overflow-y: auto;
+	width: 100%;
+	padding-right: 10%;
+	overflow-x: hidden;
+	overflow-y: auto;
 }
 
 #profMainContainer {
-    position: relative;
-    top: 0;
-    left: 50%;
+	position: relative;
+	top: 0;
+	left: 50%;
 }
 
 #profBanner {
-    border: 5px solid #0D0D0D;
-    border-top: 0;
-    border-bottom: 0;
+	border: 5px solid #0D0D0D;
+	border-top: 0;
+	border-bottom: 0;
 }
 
 #profAvatar {
-    border: 10px solid #0D0D0D;
-    -moz-border-radius: 50%;
-    -webkit-border-radius: 50%;
-    border-radius: 50%;
-    position: absolute;
-    top: 43%;
-    left: 2.5%;
-    float: left;
-    z-index: 5;
+	border: 10px solid #0D0D0D;
+	-moz-border-radius: 50%;
+	-webkit-border-radius: 50%;
+	border-radius: 50%;
+
+	position: absolute;
+	top: 43%;
+	left: 2.5%;
+	float: left;
+	z-index: 5;
 }
 
 #motdBox {
-    width: 100%;
-    height: 5%;
-    padding: 0.5% 0 0.5% 0;
-    background-color: #0D0D0D;
+	width: 100%;
+	height: 5%;
+	padding: 0.5% 0 0.5% 0;
+
+	background-color: #0D0D0D;
 }
 
 #motdBox span {
-    font-size: 130% !important;
-    margin: 0;
-    color: #FFF;
+	font-size: 130% !important;
+	margin: 0;
+	color: #FFF;
 }
 
 .username {
-    margin-left: 20% !important;
+	margin-left: 20% !important;
 }
 
 .profOptions {
-    box-shadow: 2px 2px 5px 3px #666;
-    position: absolute;
-    display: none;
-    z-index: 5;
-    opacity: 0;
-    -webkit-transition: opacity 0.4s ease;
-    -moz-transition: opacity 0.4s ease;
-    -ms-transition: opacity 0.4s ease;
-    transition: opacity 0.4s ease;
+	box-shadow: 2px 2px 5px 3px #666;
+
+	position: absolute;
+	display: none;
+	z-index: 5;
+
+	opacity: 0;
+
+	-webkit-transition: opacity 0.4s ease;  
+	-moz-transition: opacity 0.4s ease; 
+	-ms-transition: opacity 0.4s ease;
+	transition: opacity 0.4s ease; 
 }
 
 .profOptionText {
-    font-size: 150%;
-    min-width: 10%;
-    padding: 20px;
-    margin: 0;
-    text-align: center;
-    cursor: pointer;
-    -webkit-transition: box-shadow 0.4s ease;
-    -moz-transition: box-shadow 0.4s ease;
-    -ms-transition: box-shadow 0.4s ease;
-    transition: box-shadow 0.4s ease;
+	font-size: 150%;
+	min-width: 10%;
+	padding: 20px;
+	margin: 0;
+
+	text-align: center;
+	cursor: pointer;
+	
+	-webkit-transition: box-shadow 0.4s ease;  
+	-moz-transition: box-shadow 0.4s ease; 
+	-ms-transition: box-shadow 0.4s ease;
+	transition: box-shadow 0.4s ease;
 }
 
 .profOptions p:hover {
-    box-shadow: inset 0 0 0 99999px rgba(0, 0, 0, 0.1);
+	box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.1);
 }
 
 #profCards {
-    margin-top: 3%;
-    margin-bottom: 3%;
+	margin-top: 3%;
+	margin-bottom: 3%;
 }
 
 .card {
-    margin-bottom: 5%;
-    padding: 4%;
-    padding-top: 2.5%;
-    padding-right: 4%;
-    box-shadow: 2px 2px 5px 3px #666;
+	margin-bottom: 5%;
+	padding: 4%;
+	padding-top: 2.5%;
+	padding-right: 4%;
+
+	box-shadow: 2px 2px 5px 3px #666;
 }
 
 #profInfo {
-    width: 30%;
-    float: left;
-    border-top: 5px solid #CC4444;
+	width: 30%;
+	float: left;
+	border-top: 5px solid #CC4444;
 }
 
 #about {
-    padding: 5%;
+	padding: 5%;
 }
 
 #profClasses {
-    width: 50%;
-    height: 30%;
-    float: right;
-    border-top: 5px solid #2E4F74;
-    -webkit-transition: width 0.4s ease;
-    -moz-transition: width 0.4s ease;
-    -ms-transition: width 0.4s ease;
-    transition: width 0.4s ease;
+	width: 50%;
+	height: 30%;
+	float: right;
+	border-top: 5px solid #2E4F74;
+
+	-webkit-transition: width 0.4s ease;  
+	-moz-transition: width 0.4s ease; 
+	-ms-transition: width 0.4s ease;
+	transition: width 0.4s ease;
 }
 
 #profClassInfoHolder {
-    -webkit-transition: opacity 0.4s ease;
-    -moz-transition: opacity 0.4s ease;
-    -ms-transition: opacity 0.4s ease;
-    transition: opacity 0.4s ease;
+	-webkit-transition: opacity 0.4s ease;  
+	-moz-transition: opacity 0.4s ease; 
+	-ms-transition: opacity 0.4s ease;
+	transition: opacity 0.4s ease; 
 }
 
 #classes {
-    padding: 4% 0 4% 0;
+	padding: 4% 0 4% 0;
 }
 
 #profFunctions {
-    display: inline;
+	display: inline;
 }
 
 .profFunction {
-    margin-right: 1%;
-    padding: 2%;
-    border: 2px solid rgba(0, 0, 0, 0.2);
-    display: inherit;
-    cursor: pointer;
-    -webkit-transition: background-color 0.4s ease;
-    -moz-transition: background-color 0.4s ease;
-    -ms-transition: background-color 0.4s ease;
-    transition: background-color 0.4s ease;
+	margin-right: 1%;
+	padding: 2%;
+
+	border: 2px solid rgba(0,0,0,0.2);
+
+	display: inherit;
+	cursor: pointer;
+
+	-webkit-transition: background-color 0.4s ease;  
+	-moz-transition: background-color 0.4s ease; 
+	-ms-transition: background-color 0.4s ease;
+	transition: background-color 0.4s ease;
 }
 
 .profFunction:hover {
-    background-color: rgba(0, 0, 0, 0.1);
+	background-color: rgba(0,0,0,0.1);
+
 }
 
-.profFunction i,
-.profFunction h4 {
-    padding: 1%;
+.profFunction i, .profFunction h4 {
+	padding: 1%;
 }
 
 #searchBar {
-    display: inline;
+	display: inline;
 }
 
 #profClassSearch {
-    font-size: 125%;
-    width: 30%;
-    margin-top: 3%;
-    padding: 1.5% 1% 1.5% 1%;
-    -webkit-animation: expand .7s ease 1;
+	font-size: 125%;
+	width: 30%;
+	margin-top: 3%;
+	padding: 1.5% 1% 1.5% 1%;
+
+	-webkit-animation: expand .7s ease 1;
     animation: expand .7s ease 1;
 }
 
 @-webkit-keyframes expand {
-    0% {
-        width: 0%;
-    }
-    100% {
-        width: 30%;
-    }
-}
+    0%	 { width: 0%; }
+    100% { width: 30%; }
+} 
 
 @keyframes expand {
-    0% {
-        width: 0%;
-    }
-    100% {
-        width: 30%;
-    }
+    0%	 { width: 0%; }
+    100% { width: 30%; }
 }
 
 #label {
-    width: 90%;
-    margin-top: 2.5%;
-    margin-bottom: 2%;
-    background-color: rgba(0, 0, 0, 0.2);
-    box-shadow: none;
-    display: table;
-    cursor: default;
+	width: 90%;
+	margin-top: 2.5%;
+	margin-bottom: 2%;
+	
+	background-color: rgba(0,0,0,0.2);
+	box-shadow: none;
+
+	display: table;
+	cursor: default;
 }
 
 .classHolder {
-    width: 90%;
-    padding: 1%;
-    padding-right: 100%;
-    display: inline-block;
-    overflow-x: hidden;
-    overflow-y: scroll;
+	width: 90%;
+	padding: 1%;
+	padding-right: 100%;
+
+	display: inline-block;
+
+	overflow-x: hidden;
+	overflow-y: scroll;
 }
 
 .classHolder h3 {
-    font-style: italic;
-    font-weight: 200;
-    margin-left: 1%;
-    color: #999;
-    -webkit-filter: none;
-    filter: none;
+	font-style: italic;
+	font-weight: 200;
+	margin-left: 1%;
+
+	color: #999;
+
+	-webkit-filter :none;
+	filter: none;
 }
 
 .classBox {
-    font-size: 150%;
-    width: 100%;
-    margin-bottom: 3%;
-    padding: 2%;
-    box-shadow: 2px 2px 5px 3px #666;
-    display: table;
-    cursor: pointer;
-    -webkit-transition: background-color 0.4s ease;
-    -moz-transition: background-color 0.4s ease;
-    -ms-transition: background-color 0.4s ease;
-    transition: background-color 0.4s ease;
+	font-size: 150%;
+	width: 100%;
+	margin-bottom: 3%;
+	padding: 2%;
+
+	box-shadow: 2px 2px 5px 3px #666;
+	display: table;
+	cursor: pointer;
+
+	-webkit-transition: background-color 0.4s ease;  
+	-moz-transition: background-color 0.4s ease; 
+	-ms-transition: background-color 0.4s ease;
+	transition: background-color 0.4s ease;
 }
 
 .classBox:hover {
-    background-color: rgba(0, 0, 0, 0.1);
+	background-color: rgba(0,0,0,0.1);
 }
 
 .classText {
-    margin-left: .5%;
-    margin-right: 10%;
-    display: table-cell;
+	margin-left: .5%;
+	margin-right: 10%;
+	display: table-cell;
 }
 
 .name {
-    width: 40%;
+	width: 40%;
 }
 
 .teacher {
-    width: 25%;
+	width: 25%;
 }
 
 .hour {
-    width: 15%;
+	width: 15%;
 }
 
 .subscribers {
-    width: 13%;
+	width: 13%;
 }
 
 #creRules {
-    position: absolute;
+	position: absolute;
 }
 
 #create {
-    margin-top: 2.5%;
-    padding: 5%;
-    padding-top: 1%;
+	margin-top: 2.5%;
+	padding: 5%;
+	padding-top: 1%;
 }
 
 #create div {
-    margin: 2%;
-    margin-left: 11%;
-    margin-bottom: 5%;
-    display: inline-block;
+	margin: 2%;
+	margin-left: 11%;
+	margin-bottom: 5%;
+	display: inline-block;
 }
 
 .creInput {
-    font-size: 120%;
-    padding: 3%;
+	font-size: 120%;
+	padding: 3%;
 }
 
 .creOp {
-    margin: 0 !important;
+	margin: 0 !important;
 }
 
 .-autocomplete-container {
-    margin: 0.5% 0 0 0 !important;
-    display: none;
+	margin: 0.5% 0 0 0 !important;
+	display: none;
 }
 
 #creSubmit {
-    font-weight: 200;
-    font-size: 140%;
-    margin: 0 35% 0 35%;
-    padding: 2%;
-    background-color: rgba(0, 0, 0, 0.25);
-    text-align: center;
-    cursor: pointer;
-    -webkit-transition: background-color 0.4s ease;
-    -moz-transition: background-color 0.4s ease;
-    -ms-transition: background-color 0.4s ease;
-    transition: background-color 0.4s ease;
+	font-weight: 200;
+	font-size: 140%;
+	margin: 0 35% 0 35%;
+	padding: 2%;
+
+	background-color: rgba(0,0,0,0.25);
+	text-align: center;
+	cursor: pointer;
+
+	-webkit-transition: background-color 0.4s ease;  
+	-moz-transition: background-color 0.4s ease; 
+	-ms-transition: background-color 0.4s ease;
+	transition: background-color 0.4s ease;
 }
 
 #creSubmit:hover {
-    background-color: rgba(0, 0, 0, 0.15);
+	background-color: rgba(0,0,0,0.15);
 }
 
 #restrict {
-    font-size: 100%;
-    font-style: italic;
-    font-weight: 300;
-    padding-left: 1%;
-    color: #999 !important;
+	font-size: 100%;
+	font-style: italic;
+	font-weight: 300;
+	padding-left: 1%;
+	color: #999 !important;
 }
 
 #save {
-    font-size: 90%;
-    background-color: #CC4444;
-    box-shadow: -1px 2px 5px 1px #333;
-    position: absolute;
-    top: 0;
-    right: 10%;
-    z-index: 5;
-    -webkit-transition: transform 0.2s ease, background-color 0.1s ease;
-    -moz-transition: transform 0.2s ease, background-color 0.1s ease;
-    -ms-transition: transform 0.2s ease, background-color 0.1s ease;
-    transition: transform 0.2s ease, background-color 0.1s ease;
+	font-size: 90%;
+	background-color: #CC4444;
+
+	box-shadow: -1px 2px 5px 1px #333;
+
+	position: absolute;
+	top: 0;
+	right: 10%;
+	z-index: 50;
+
+	-webkit-transition: transform 0.2s ease, background-color 0.1s ease;  
+	-moz-transition: transform 0.2s ease, background-color 0.1s ease; 
+	-ms-transition: transform 0.2s ease, background-color 0.1s ease;
+	transition: transform 0.2s ease, background-color 0.1s ease;
 }
 
-#save:hover {
-    -webkit-transform: scale(1.05);
+#save:hover, #mainpage:hover {
+	-webkit-transform: scale(1.05);
     -moz-transform: scale(1.05);
     -ms-transform: scale(1.05);
     -o-transform: scale(1.05);
@@ -358,13 +376,36 @@
 }
 
 #save:active {
-    background-color: #34CB34;
+	background-color: #34CB34;
+}
+
+#save h2, #mainpage h2 {
+	font-weight: 200;
+	width: 100%;
+	padding: 8%;
+
+	-webkit-filter: none;
+	filter: none !important;
+}
+
+#mainpage {
+	font-size: 90%;
+	background-color: #617C9E;
+
+	box-shadow: -1px 2px 5px 1px #333;
+
+	position: absolute;
+	top: 0;
+	left: 10%;
+	z-index: 50;
+
+	-webkit-transition: transform 0.2s ease, background-color 0.1s ease;  
+	-moz-transition: transform 0.2s ease, background-color 0.1s ease; 
+	-ms-transition: transform 0.2s ease, background-color 0.1s ease;
+	transition: transform 0.2s ease, background-color 0.1s ease;
+}
+
+#mainpage:active {
+	background-color: #56708D;
 }
 
-#save h2 {
-    font-weight: 200;
-    width: 100%;
-    padding: 8%;
-    -webkit-filter: none;
-    filter: none !important;
-}
\ No newline at end of file
diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html
index f2ce225..8128d04 100644
--- a/hourglass/client/profile/profile.html
+++ b/hourglass/client/profile/profile.html
@@ -1,6 +1,7 @@
 <template name="profile">
 	<div id="profPage" style="background-color:{{divColor 'header'}};height:{{mainHeight}};">
 		<div id="save"><h2>Save Settings</h2></div>
+		<div id="mainpage" onclick="window.location='/'"><h2>Main Page</h2></div>
 		<div id="profMainContainer" style="{{mainCenter}}">
 			<div id="profBanner" style="{{banner}};"></div>
 			<div id="profAvatar" style="{{avatar}};{{avatarDim}}"></div>
@@ -56,9 +57,9 @@
 								<span class="subscriptions classText">Members</span>
 							</div>
 							<div class="classHolder" style="max-height:{{classHolderHeight}}">
-								<!-- {{#each myclasses}}
+								{{#each myclasses}}
 									{{> classDisplay}}
-								{{/each}} -->
+								{{/each}}
 							</div>
 						{{/if}}
 
@@ -148,4 +149,4 @@
 		<span class="hour classText">{{hour}}</span>
 		<span class="subscribers classText">{{subscribers}}</span>
 	</div>
-</template>
+</template>
\ No newline at end of file