diff --git a/templates/views/settings.html b/templates/views/settings.html
index fd1cf52..96b3f74 100644
--- a/templates/views/settings.html
+++ b/templates/views/settings.html
@@ -15,10 +15,12 @@
 							</div>
 							<div flex="70%">
 								<md-button class="md-raised" ng-click="changeProfileMode()">
-									<i ng-class="[profileModeIcon]"></i> {{profileMode}}
+									<i ng-class="profileModeIcon"></i> {{profileMode}}
 								</md-button>
 							</div>
 						</div>
+					</div>
+					<div layout="column" ng-if="!isEditMode">
 						<div>
 							<h2>{{user.name}}</h2>
 						</div>
@@ -29,6 +31,25 @@
 							I Am a: {{(user.isLecturer) ? "Lecturer" : "Student"}}
 						</div>
 					</div>
+					<div layout="column" ng-if="isEditMode">
+						<div>
+							<md-input-container>
+							      <label>Full Name</label>
+							      <input ng-model="user.name">
+						    </md-input-container>
+						</div>
+						<div>
+							<md-input-container>
+							      <label>Email</label>
+							      <input ng-model="user.email">
+						    </md-input-container>
+						</div>
+						<div>
+							<md-switch ng-model="user.isLecturer" aria-label="Switch 1">
+								I Am a: {{(user.isLecturer) ? "Lecturer" : "Student"}}
+  							</md-switch>
+						</div>
+					</div>
 				</md-card>
 			</div>
 		</div>