diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html
index 5139925..c014bb9 100644
--- a/hourglass/client/main/main.html
+++ b/hourglass/client/main/main.html
@@ -53,12 +53,4 @@
             <i class="fa fa-times-circle-o" aria-hidden="true"></i>
         </div>
     </div>
-</template>
-
-<template name="schoollist">
-    {{name}}
-</template>
-
-<template name="teacherlist">
-    {{teacher}}
 </template>
\ No newline at end of file
diff --git a/hourglass/client/profile/profile.css b/hourglass/client/profile/profile.css
index 95860fc..af3382b 100644
--- a/hourglass/client/profile/profile.css
+++ b/hourglass/client/profile/profile.css
@@ -20,6 +20,7 @@
 	font-weight: 400;
 	margin: 0;
 	margin-bottom: 1%;
+	margin-right: 10%;
 }
 
 .profHea {
@@ -301,15 +302,22 @@
 	padding-top: 1%;
 }
 
+#formContainer {
+	margin-left: 5% !important;
+	margin-right: 5% !important;
+	margin-bottom: 0 !important;
+	position: relative;
+	
+}
+
 #create div {
-	margin: 2%;
-	margin-left: 11%;
-	margin-bottom: 5%;
+	margin: 3% 6% 5% 6%;
 	display: inline-block;
 }
 
 .creInput {
 	font-size: 120%;
+	width: 100%;
 	padding: 3%;
 }
 
diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html
index 8128d04..4efef97 100644
--- a/hourglass/client/profile/profile.html
+++ b/hourglass/client/profile/profile.html
@@ -91,40 +91,42 @@
 						{{#if profClassTab "creClass"}}
 							<div id="creRules"><p>Insert description and rules of create a class --Will style later--</p></div>
 							<form id="create">
-								<div>
-					            	<p class="profTitle">School:</p>
-			              			{{> inputAutocomplete settings=schoolcomplete class="form-control creInput" 		type="text" name="school" placeholder="Example: International Academy" }}
-				              	</div>
-				              	<div>
-					            	<p class="profTitle">Hour:</p>
-					              	<input class="creInput" type="text" name="hour">
-					            </div>
-					            <div>
-					            	<p class="profTitle">Teacher:</p>
-					              	{{> inputAutocomplete settings=teachercomplete class="form-control creInput" type="text" name="teacher" placeholder="Example: Woods" }}
-					            </div>
-					            <div>
-					            	<p class="profTitle">Class Name:</p>
-					              	<input class="creInput" type="text" name="classname">
-					            </div>
-					            <div>
-						            <p class="profTitle">Privacy:</p>
-					              	<input class="creInput radio op" type="text" name="privacy" opc="1" op="1" readonly>
-					              	<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
-					                  	<p class="profOptionText">Public</p>
-					                  	<p class="profOptionText">Private</p>
+								<div id="formContainer">
+									<div>
+						            	<p class="profTitle">School:</p>
+				              			{{> inputAutocomplete settings=schoolcomplete class="form-control creInput" 		type="text" name="school" placeholder="Example: International Academy" }}
 					              	</div>
-				              	</div>
-				              	<div>
-						            <p class="profTitle">Category:</p>
-					              	<input class="creInput radio op" type="text" name="category" opc="1" op="2" readonly>
-					              	<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
-					                  	<p class="profOptionText">Class</p>
-					                  	<p class="profOptionText">Club</p>
-					                  	<p class="profOptionText">Other</p>
+					              	<div>
+						            	<p class="profTitle">Hour:</p>
+						              	<input class="creInput" type="text" name="hour">
+						            </div>
+						            <div>
+						            	<p class="profTitle">Teacher:</p>
+						              	{{> inputAutocomplete settings=teachercomplete class="form-control creInput" type="text" name="teacher" placeholder="Example: Woods" }}
+						            </div>
+						            <div>
+						            	<p class="profTitle">Class Name:</p>
+						              	<input class="creInput" type="text" name="classname">
+						            </div>
+						            <div>
+							            <p class="profTitle">Privacy:</p>
+						              	<input class="creInput radio op" type="text" name="privacy" opc="1" op="1" readonly>
+						              	<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
+						                  	<p class="profOptionText">Public</p>
+						                  	<p class="profOptionText">Private</p>
+						              	</div>
 					              	</div>
+					              	<div>
+							            <p class="profTitle">Category:</p>
+						              	<input class="creInput radio op" type="text" name="category" opc="1" op="2" readonly>
+						              	<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
+						                  	<p class="profOptionText">Class</p>
+						                  	<p class="profOptionText">Club</p>
+						                  	<p class="profOptionText">Other</p>
+						              	</div>
+							        </div>
 						        </div>
-						        <h3 id="creSubmit" style="margin-left:{{submitMargin}}">Submit Request</h3>
+						        <h3 id="creSubmit">Submit Request</h3>
 				          	</form> 
 						{{/if}}
 						</div>
@@ -149,4 +151,12 @@
 		<span class="hour classText">{{hour}}</span>
 		<span class="subscribers classText">{{subscribers}}</span>
 	</div>
+</template>
+
+<template name="schoollist">
+    {{name}}
+</template>
+
+<template name="teacherlist">
+    {{teacher}}
 </template>
\ No newline at end of file
diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js
index bd18a29..8a4a0f1 100644
--- a/hourglass/client/profile/profile.js
+++ b/hourglass/client/profile/profile.js
@@ -384,6 +384,10 @@ Template.profile.events({
     'click .fa-check-circle-o' () {
         sendData(Session.get("confirm"));
         closeDivFade(document.getElementsByClassName("overlay")[0]);
+        if(Session.get("confirm") === "createClass") {
+        	var form = document.getElementById("create");
+        	for(var i = 0; i < form.length; i++) form[i].value = "";
+        }
         Session.set("serverData", null);
         Session.set("confirm", null);
     },