diff --git a/templates/js/controllers/campusesController.js b/templates/js/controllers/campusesController.js
index 5f782d6..18a79dd 100644
--- a/templates/js/controllers/campusesController.js
+++ b/templates/js/controllers/campusesController.js
@@ -2,6 +2,7 @@ angular.module('SeHub')
 .controller('campusesController', ['$scope', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function($scope, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService, $rootScope)
 {
 	$scope.threeSizedArray =[];
+	$scope.campusesEmpty = false;
 	var token = $cookies['com.sehub.www'];
 
 	apiService.getCampusesByUser(token).success(function(data) // Get all the campuses
@@ -21,32 +22,39 @@ angular.module('SeHub')
 		var i, j, counter = 0;
 		var newLength = 0;
 		
-		if(($scope.campuses.length % 3) === 0)
+		if($scope.campuses != null)
 		{
-			newLength = ($scope.campuses.length / 3);
+			if(($scope.campuses.length % 3) === 0)
+			{
+				newLength = ($scope.campuses.length / 3);
+			}
+			else
+			{
+				newLength = (Math.ceil($scope.campuses.length / 3)); // Rounds number up
+			}
+			
+			console.log("length: " + newLength);
+			$scope.threeSizedArray.length = newLength;
+
+			for(j = 0; j < newLength; j++)	
+			{
+				$scope.threeSizedArray[j] = [3]; // Creating array in size of 3 in each array cell
+			}
+
+			for(i = 0; i < newLength; i++)		
+			{		
+				for(j = 0; j < newLength; j++)
+				{
+					if($scope.campuses[(3*i) + j] != null)
+					{	
+						$scope.threeSizedArray[i][j] = $scope.campuses[(3*i) + j];
+					}
+				}	
+			}
 		}
 		else
 		{
-			newLength = (Math.ceil($scope.campuses.length / 3)); // Rounds number up
-		}
-		
-		console.log("length: " + newLength);
-		$scope.threeSizedArray.length = newLength;
-
-		for(j = 0; j < newLength; j++)	
-		{
-			$scope.threeSizedArray[j] = [3]; // Creating array in size of 3 in each array cell
-		}
-
-		for(i = 0; i < newLength; i++)		
-		{		
-			for(j = 0; j < newLength; j++)
-			{
-				if($scope.campuses[(3*i) + j] != null)
-				{	
-					$scope.threeSizedArray[i][j] = $scope.campuses[(3*i) + j];
-				}
-			}	
+			$scope.campusesEmpty = true;
 		}
 		console.log($scope.threeSizedArray); // TODO REMOVE
 	}
diff --git a/templates/js/controllers/homeController.js b/templates/js/controllers/homeController.js
index 4dd0251..5dc7f83 100644
--- a/templates/js/controllers/homeController.js
+++ b/templates/js/controllers/homeController.js
@@ -13,7 +13,6 @@ angular.module('SeHub')
 
   var imagePath = $scope.user.avatar_url;
   //var campusName = '';
-  $scope.course = '';
   // $scope.campusName = '';
 
   $scope.phones = [
@@ -51,8 +50,30 @@ angular.module('SeHub')
   }
   $scope.postMessageClicked = function() // Posting the message itself
   {  
+    
+
     if($scope.msg.msgToAdd != null)
     {
+      jsonNewMsg = {
+      'courseName': 'A', // TODO Should be ===> $scope.course.courseName
+      'message': $scope.msg.msgToAdd
+      };
+
+      // console.log("J: " + jsonNewMsg.toString() + "msg: " + $scope.msg.msgToAdd);
+
+      // apiService.createMessage(token, jsonNewMsg).success(function(data)
+      // {
+      //   console.log("create Msg!");
+      // }).error(function(err)
+      // {
+      //   console.log("Error: " + err);
+      // });
+
+      /*
+      'courseName': 'Advance Math',
+      'message': 'The lecture today is canceled'
+      */
+
       console.log($scope.msg.msgToAdd);
       $scope.messages.push({"text": $scope.msg.msgToAdd});
     }
diff --git a/templates/js/controllers/mainController.js b/templates/js/controllers/mainController.js
index b9ac448..964b4ec 100644
--- a/templates/js/controllers/mainController.js
+++ b/templates/js/controllers/mainController.js
@@ -31,7 +31,7 @@ angular.module('SeHub')
 					"title": "Projects",
 					"icon": "fa fa-cube",
 					"style": "",
-					"route": "/myClasses"
+					"route": "/projects"
 				}, {
 					"title": "Tasks",
 					"icon": "fa fa-clipboard",
diff --git a/templates/js/controllers/myClassesController.js b/templates/js/controllers/myClassesController.js
index d301be6..4d5836d 100644
--- a/templates/js/controllers/myClassesController.js
+++ b/templates/js/controllers/myClassesController.js
@@ -1,5 +1,5 @@
 angular.module('SeHub')
-.controller('myClassesController', ['$scope', '$routeParams', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $routeParams, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService ,$rootScope)
+.controller('myClassesController', ['$scope', '$location', '$routeParams', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $location, $routeParams, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService ,$rootScope)
 {
 	$scope.isStudent = false;
 	$scope.isCourse = false;
@@ -10,28 +10,21 @@ angular.module('SeHub')
 	$scope.user.finalDate = '';
 	$scope.user.startDate = '';
 	$scope.showMyClass = false;
+	$scope.coursesEmpty = false;
 	var campusId = $routeParams.campusId;
 	
-	if($scope.user.isLecturer)
+	var displayCourses = function()
 	{
-		$scope.isStudent = false;
-		console.log("Lecturer Mode!");
+		apiService.getCoursesByUser(token, campusId).success(function(data) // Get all the courses for display
+		{
+			$scope.courses = data;
+			console.log("success " + $scope.courses);
+			init(); // Executing the function to initialize course display
+		}).error(function(err)
+		{
+			console.log("error: " + err);
+		});
 	}
-	else
-	{
-		$scope.isStudent = true;
-		console.log("Student Mode!");
-	}
-
-	apiService.getCoursesByUser(token, campusId).success(function(data) // Get all the courses for display
-	{
-		$scope.courses = data;
-		console.log("success " + $scope.courses);
-		init(); // Executing the function to initialize course display
-	}).error(function(err)
-	{
-		console.log("error: " + err);
-	});
 
 	$scope.goToClass = function(classId)
 	{
@@ -52,8 +45,6 @@ angular.module('SeHub')
 		{
 			console.log("Error: " + err);
 		});
-
-
 	}
 
 	$scope.createCourseClicked = function()
@@ -63,7 +54,7 @@ angular.module('SeHub')
 
 	$scope.submitNewClassClicked = function()
 	{
-	   	if($scope.course.courseName != '' && $scope.course.endDate != '' && $scope.course.startDate != '')
+	   	if($scope.course.courseName != null && $scope.course.endDate != null && $scope.course.startDate != null)
 	    {
 	    	var jsonNewCourse =
 	    	{
@@ -71,38 +62,35 @@ angular.module('SeHub')
 	    		'campusName': $scope.course.campusName,
 	    		'startDate': {
 	    			'year' : $scope.course.startDate.getFullYear(),
-	    			'day' :  $scope.course.startDate.getDate(),
-	    			'month': ($scope.course.startDate.getMonth() + 1)
+	    			'day' : $scope.course.startDate.getDate(),
+	    			'month': $scope.course.startDate.getMonth() + 1
 	    		},
 	    		'endDate': {
 	    			'year' : $scope.course.endDate.getFullYear(),
-	    			'day' :  $scope.course.endDate.getDate(),
-	    			'month': ($scope.course.endDate.getMonth() + 1)
+	    			'day' : $scope.course.endDate.getDate(),
+	    			'month': $scope.course.endDate.getMonth() + 1
 	    		}
 	    	};
 
-	    	// $scope.globalVar = jsonNewCourse;
-
-	    	console.log("Json here:");
+	    	console.log("Json here: " + $scope.chosenCampus);
     		console.log(jsonNewCourse);
 	      	
 	      	apiService.createCourse(token, jsonNewCourse).success(function(data)
 	      	{
 	      		console.log("createCourse API done");
-	      	}).error(function(err)
-	      	{
-	      		console.log(err);
-	      	});
-	      	$mdDialog.show($mdDialog.alert().title('Course Created').content('You have created course successfully.')
+	      		$mdDialog.show($mdDialog.alert().title('Course Created').content('You have created course successfully.')
 		        .ariaLabel('Email verification alert dialog').ok('Lets Start!').targetEvent())
 			.then(function() {
 							$window.location.href = 'templates/views/newCourse.html'; // TODO TODO TODO
 						}); // Pop-up alert
-
+	      	}).error(function(err)
+	      	{
+	      		console.log(err);
+	      	});
 	    }
 	    else
 	    {
-	    	$mdDialog.show($mdDialog.alert().title('Error - Creating Course').content('You have encountered and error in creating the course.')
+	    	$mdDialog.show($mdDialog.alert().title('Error - Creating Course').content('Some fields are missing.')
 		        .ariaLabel('Email verification alert dialog').ok('Try Again!').targetEvent());
 	    }
 	}
@@ -112,36 +100,57 @@ angular.module('SeHub')
 		var i, j, counter = 0;
 		var newLength = 0;
 		
-		if(($scope.courses.length % 3) === 0)
+		if($scope.courses != null)
 		{
-			newLength = ($scope.courses.length / 3);
+			if(($scope.courses.length % 3) === 0)
+			{
+				newLength = ($scope.courses.length / 3);
+			}
+			else
+			{
+				newLength = (Math.ceil($scope.courses.length / 3)); // Rounds number up
+			}
+			
+			console.log("length: " + newLength);
+			$scope.holdArrays.length = newLength;
+
+			for(j = 0; j < newLength; j++)	
+			{
+				$scope.holdArrays[j] = [3]; // Creating array in size of 3 in each array cell
+			}
+
+			for(i = 0; i < newLength; i++)		
+			{		
+				for(j = 0; j < newLength; j++)
+				{
+					if($scope.courses[(3*i) + j] != null)
+					{	
+						$scope.holdArrays[i][j] = $scope.courses[(3*i) + j];
+					}
+				}	
+			}
 		}
 		else
 		{
-			newLength = (Math.ceil($scope.courses.length / 3)); // Rounds number up
+			$scope.coursesEmpty = true;
 		}
-		
-		console.log("length: " + newLength);
-		$scope.holdArrays.length = newLength;
-
-		for(j = 0; j < newLength; j++)	
-		{
-			$scope.holdArrays[j] = [3]; // Creating array in size of 3 in each array cell
-		}
-
-		for(i = 0; i < newLength; i++)		
-		{		
-			for(j = 0; j < newLength; j++)
-			{
-				if($scope.courses[(3*i) + j] != null)
-				{	
-					$scope.holdArrays[i][j] = $scope.courses[(3*i) + j];
-				}
-			}	
-		}
-		console.log($scope.holdArrays);
+			console.log($scope.holdArrays);
 	}
 
 
+	if($scope.user.isLecturer)
+	{
+		$scope.isStudent = false;
+		console.log("Lecturer Mode!");
+	}
+	else
+	{
+		$scope.isStudent = true;
+		console.log("Student Mode!");
+	}
+
+	displayCourses(); // Will display the courses that the user related to // TODO!!
+
+
 
 }]);
\ No newline at end of file
diff --git a/templates/js/controllers/newCourseController.js b/templates/js/controllers/newCourseController.js
index f66f396..3eccaea 100644
--- a/templates/js/controllers/newCourseController.js
+++ b/templates/js/controllers/newCourseController.js
@@ -1,10 +1,8 @@
 angular.module('SeHub')
 .controller('newCourseController', ['$scope', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService ,$rootScope)
 {
-
 	$scope.goBack = function()
 	{
 		$window.location.href = 'templates/views/myClasses.html';
 	}
-
 }]);
\ No newline at end of file
diff --git a/templates/js/controllers/projectsController.js b/templates/js/controllers/projectsController.js
index 0a68d3b..a83fd6b 100644
--- a/templates/js/controllers/projectsController.js
+++ b/templates/js/controllers/projectsController.js
@@ -1,60 +1,121 @@
 angular.module('SeHub')
-.controller('projectsController', ['$scope', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService ,$rootScope)
+.controller('projectsController', ['$scope', '$routeParams', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $routeParams, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService ,$rootScope)
 {
-	console.log("in projects controller");
+	var token = $cookies['com.sehub.www'];
+	var classId = $routeParams.id;
+	$scope.projectEmpty = false;
+
+
+
+	$scope.displayProjects = function()
+	{
+		console.log("in displayProjecs!!! ");
+		apiService.getProjectsByCourse(token, classId).success(function(data) // Get all the campuses
+		{
+			$scope.projects = data;
+			init(); // Executing the function to initialize projects display
+			console.log("project created! not rly!! " + classId);
+		}).error(function(err)
+		{
+			console.log("Error: " + err);
+		});
+	}
+
+
+
+	$scope.displayProjects(); // Displaying all projects related to user
 
 	$scope.createProjectClicked = function()
 	{
-		console.log("project created! not rly!! ");
+		console.log("project created! not rly!! " + classId);
 		// $window.location.href = 'http://localhost:8080/home#/tasks/new'; // Reference to 'newTask' page
-
 	}
 
-	$scope.projects = ['AMI', 'LULU', 'XIN Zhau', 'LUMI lu', 'Shimi', 'Azligi zligi', 'Drugs'];
+	// $scope.projects = ['AMI', 'LULU', 'XIN Zhau', 'LUMI lu', 'Shimi', 'Azligi zligi', 'Drugs'];
 
-	// apiService.getProjectsByCourse(courseId).success(function(data) // Get all the campuses
-	// {
-	// 	$scope.projects = data;
-	// }).error(function() {
-	// // TODO
-	// });
+	$scope.goToProject = function()
+	{
+		console.log("projects only from classID: "  + classId)
+		$location.path('/thisProject' + classId);
+	}
 
 	var init = function()
 	{
 		var i, j, counter = 0;
 		var newLength = 0;
-		
-		if(($scope.projects.length % 3) === 0)
+			
+		if($scope.projects != null)
 		{
-			newLength = ($scope.projects.length / 3);
+			if(($scope.projects.length % 3) === 0)
+			{
+				newLength = ($scope.projects.length / 3);
+			}
+			else
+			{
+				newLength = (Math.ceil($scope.projects.length / 3)); // Rounds number up
+			}
+			
+			console.log("length: " + newLength);
+			$scope.arrayHolder.length = newLength;
+
+			for(j = 0; j < newLength; j++)	
+			{
+				$scope.arrayHolder[j] = [3]; // Creating array in size of 3 in each array cell
+			}
+
+			for(i = 0; i < newLength; i++)		
+			{		
+				for(j = 0; j < newLength; j++)
+				{
+					if($scope.projects[(3*i) + j] != null)
+					{	
+						$scope.arrayHolder[i][j] = $scope.projects[(3*i) + j];
+					}
+				}	
+			}
+			console.log($scope.arrayHolder);
 		}
 		else
 		{
-			newLength = (Math.ceil($scope.projects.length / 3)); // Rounds number up
+			$scope.projectEmpty = true;
 		}
-		
-		console.log("length: " + newLength);
-		$scope.arrayHolder.length = newLength;
-
-		for(j = 0; j < newLength; j++)	
-		{
-			$scope.arrayHolder[j] = [3]; // Creating array in size of 3 in each array cell
-		}
-
-		for(i = 0; i < newLength; i++)		
-		{		
-			for(j = 0; j < newLength; j++)
-			{
-				if($scope.projects[(3*i) + j] != null)
-				{	
-					$scope.arrayHolder[i][j] = $scope.projects[(3*i) + j];
-				}
-			}	
-		}
-		console.log($scope.arrayHolder);
 	}
 
-	init(); // Executing the function to initialize projects display
+
+
+	    	
+	    	/*
+	    	var jsonNewCourse =
+	    	{
+	    		'courseName': $scope.course.courseName,
+	    		'campusName': $scope.course.campusName,
+	    		'startDate': {
+	    			'year' : $scope.course.startDate.getFullYear(),
+	    			'day' : $scope.course.startDate.getDate(),
+	    			'month': $scope.course.startDate.getMonth() + 1
+	    		},
+	    		'endDate': {
+	    			'year' : $scope.course.endDate.getFullYear(),
+	    			'day' : $scope.course.endDate.getDate(),
+	    			'month': $scope.course.endDate.getMonth() + 1
+	    		}
+	    	};*/
+
+	    		/*
+			{
+		'projectName': 'Advance Math',
+		'courseName': 'JCE',
+		'grade': 98,
+		'logo_url': 'http://location.domain.com/image.jpg',
+		'gitRepository': 'http://location.git.com/somthing',
+		'membersId': ['bob', 'dylan', 'quentin', 'terentino'],
+		'id' : 1234567890
+		} 
+	*/
+
+
+
+
 
 
 }]);
\ No newline at end of file
diff --git a/templates/js/controllers/tasksController.js b/templates/js/controllers/tasksController.js
index 705ddb2..33196f4 100644
--- a/templates/js/controllers/tasksController.js
+++ b/templates/js/controllers/tasksController.js
@@ -8,7 +8,6 @@ angular.module('SeHub')
 		var taskName = name;
 		console.log("task created! " + taskName);
 		$location.path("/tasks/new"); // Reference to 'newTask' page
-
 	}
 
 
diff --git a/templates/js/services/apiService.js b/templates/js/services/apiService.js
index 9826c64..5c636aa 100644
--- a/templates/js/services/apiService.js
+++ b/templates/js/services/apiService.js
@@ -95,7 +95,6 @@ service.factory('apiService', ['$http', function($http) {
 				method : "POST",
 				url : url,
 				data: payLoad
-
 			};
 			return $http(req);
 		},
@@ -142,6 +141,23 @@ service.factory('apiService', ['$http', function($http) {
 
 			};
 			return $http(req);
+		},
+		joinCourse: function(token, courseId){
+			var url =  (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/users/getUserById/" + token + "/" + courseId;
+			req = {
+				method : "PUT",
+				url : url
+			};
+			return $http(req);
+		},
+		createMessage: function(token, payLoad){
+			var url =  (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/create/" + token;
+			req = {
+				method : "POST",
+				url : url,
+				data: payLoad
+			};
+			return $http(req);
 		}
 	};
 }]);
\ No newline at end of file
diff --git a/templates/views/campuses.html b/templates/views/campuses.html
index d4e2523..66d3654 100644
--- a/templates/views/campuses.html
+++ b/templates/views/campuses.html
@@ -2,14 +2,21 @@
 	<md-content layout-padding layout-margin>
 		<h1 layout-margin style="margin-left:15px"><i class="fa fa-university"></i> Pick A Campus</h1>
 	</md-content>
-	<md-card class="cardAllCampuses">	
-		<div class = "allCampusesShow" flex = "99" layout = "row" ng-repeat = "t in threeSizedArray" value = "{{t}}" layout-padding>
-			<div flex = "32" layout = "column" ng-repeat = "campus in t" value = "{{campus}}">
-				<md-button ng-click = "goToCampus(campus.id)" style="width:32%; height:32%;" flex="32" layout-padding class = "md-raised">
-					<!-- <img src="{{campus.avatar_url}}" style = "width:14%; height:auto;"> -->
-					{{campus.title}}
-				</md-button>
+	<md-card class="cardAllCampuses">
+		<div ng-if = "!scope.campusesEmpty">
+			<div class = "allCampusesShow" flex = "99" layout = "row" ng-repeat = "t in threeSizedArray" value = "{{t}}" layout-padding>
+				<div flex = "32" layout = "column" ng-repeat = "campus in t" value = "{{campus}}">
+					<md-button ng-click = "goToCampus(campus.id)" style="width:32%; height:32%;" flex="32" layout-padding class = "md-raised">
+						<!-- <img src="{{campus.avatar_url}}" style = "width:14%; height:auto;"> -->
+						{{campus.title}}
+					</md-button>
+				</div>
 			</div>
 		</div>
+		<div ng-if = "scope.campusesEmpty">>
+			<md-card>
+				You Are Not Related To Any Course, You Can Join A Course By Press 'Join'.
+			</md-card>
+		</div>
 	</md-card>
 </div>
\ No newline at end of file
diff --git a/templates/views/home.html b/templates/views/home.html
index dcce1b2..bec06f6 100644
--- a/templates/views/home.html
+++ b/templates/views/home.html
@@ -112,68 +112,6 @@
 				</div>
 			</div>
 		</md-content>
-
-		<md-content layout-padding layout-margin>
-			<h1>
-				<em><i class="fa fa-folder-open"></i> Project Evaluation</em>
-			</h1>
-			<md-select placeholder="Choose Project" ng-model="project" ng-click="chooseProjectClicked()" style="z-index: 300" class="projectDropDown">
-			</md-select>
-			<div layout = "column" layout-margin layout-padding>
-				<div layout="row">
-					<a href="http://localhost:8080/home#/projects">
-						<md-card flex class = "projectExhibit" >
-							Press On Me
-						</md-card>
-					</a>
-					<a href="http://localhost:8080/home#/projects">
-						<md-card flex class = "projectExhibit">
-							Press On Me
-						</md-card>
-					</a>
-
-					<a href="http://localhost:8080/home#/projects">
-						<md-card flex class = "projectExhibit">
-							Press On Me
-						</md-card>
-					</a>
-				</div>
-				<div layout="row">
-					<a href="http://localhost:8080/home#/projects">
-						<md-card flex class = "projectExhibit">
-						Press On Me
-						</md-card>
-					</a>
-					<a href="http://localhost:8080/home#/projects">
-						<md-card flex class = "projectExhibit">
-							Press On Me
-						</md-card>
-					</a>
-					<a href="http://localhost:8080/home#/projects">
-						<md-card flex class = "projectExhibit">
-						Press On Me
-						</md-card>
-					</a>
-				</div>
-				<div layout="row">
-					<a href="http://localhost:8080/home#/projects">
-						<md-card flex class = "projectExhibit">
-							Press On Me
-						</md-card>
-					</a>
-					<a href="http://localhost:8080/home#/projects">
-						<md-card flex class = "projectExhibit">
-							Press On Me
-						</md-card>
-					</a>
-					<a href="http://localhost:8080/home#/projects">
-						<md-card flex class = "projectExhibit">
-							Press On Me
-						</md-card>
-					</a>
-				</div>
-			</div>
-		</md-content>
 	</div>
 	<div ng-if="isStudent"> <!-- Student Mode -->
 		<md-content>
diff --git a/templates/views/myClasses.html b/templates/views/myClasses.html
index e7ae43d..637e792 100644
--- a/templates/views/myClasses.html
+++ b/templates/views/myClasses.html
@@ -5,15 +5,19 @@
 	<md-card class="cardAllcourses">	
 		<div flex = "99" class = "allcoursesShow" layout = "row" ng-repeat = "t in holdArrays" value = "{{t}}">
 			<div flex ="32" layout = "column" ng-repeat = "course in t" value = "{{course}}" layout-padding>
-				<!-- <a href="http://localhost:8080/home#/projects" style="color:black; text-decoration:none;"> -->
+				<div ng-of = "!scope.coursesEmpty">
+					aaa
 					<md-card ng-click = "goToClass(course.id)" style="width:32%; height:32%;" layout-padding class = "campusCard">
 						{{course.id}}
 					</md-card>
-				<!-- </a> -->
+				</div>
+				<div ng-if = "scope.coursesEmpty">
+					You Are Not Related To Any Course, You May Join Any Course You Wish.
+				</div>
 			</div>
 		</div>
 	</md-card>
-
+	<!-- <md-button ng-click="joinCourseClicked()" ng class="md-raised md-primary">Join Class</md-button> -->
 	<div ng-if="user.isLecturer"> <!-- Lecturer Mode -->
 		<div layout="row">
 			<div layout-margin layout-padding>
@@ -21,38 +25,32 @@
 			</div>
 		</div>
 		<div ng-if="isNewCourse">
-			<md-content>
-				<md-content layout-padding>
-					<md-card layout-padding>
-						<form name="createNewCourseForm">
-							<div layout layout-sm="column">
-								<md-input-container flex = "50">
-									<label>Campus name</label>
-									<input ng-model="course.campusName" required>
-									<!-- <md-select placeholder="Pick your Class" ng-model="chosenCampus" style="z-index: 400" ng-change="chooseCourseClicked()"> -->
-										<!-- <md-option ng-switch="user.isLecturer" ng-repeat="c in campuses" value="{{c.title}}"> -->
-											<!-- {{c.title}} -->
-										<!-- </md-option> -->
-									<!-- </md-select> -->
-								</md-input-container>
-							</div>
-							<div layout layout-sm="column">
-								<md-input-container style="width:80%">
-									<label flex = "50">Class Name</label>
-									<input ng-model="course.courseName" min-length="1" required>
-								</md-input-container>
-								<md-input-container flex = "20">
-									<label>Course Start Date</label>
-									<input type="date" ng-model="course.startDate" required>
-								</md-input-container>
-								<md-input-container flex = "20">
-									<label>Course Finish Date</label>
-									<input type="date" ng-model="course.endDate" required>
-								</md-input-container>
-							</div>
-						</form>
-					</md-card>
-				</md-content>
+			<md-content layout-padding>
+				<md-card layout-padding>
+					<div layout layout-sm="column">
+						<!-- <input ng-model="course.campusName" required> -->
+						<md-select placeholder = "Campus name" ng-model="course.campusName" ng-click = "chooseCourseClicked()" required>
+							<md-option ng-repeat="c in campuses" value="{{c.title}}">
+								{{c.title}}
+							</md-option>
+						</md-select>
+					</div>
+					<div layout layout-sm="column">
+						<md-input-container style="width:80%">
+							<label flex = "50">Class Name</label>
+							<input ng-model="course.courseName" min-length="1" required>
+						</md-input-container>
+						<md-input-container flex = "20">
+							<label>Course Start Date</label>
+							<input type="date" ng-model="course.startDate" required>
+						</md-input-container>
+						<md-input-container flex = "20">
+							<label>Course Finish Date</label>
+							<input type="date" ng-model="course.endDate" required>
+						</md-input-container>
+					</div>
+				</md-card>
+				
 				<div layout-padding layout-margin>
 					<md-button ng-click="submitNewClassClicked()" class="md-raised md-primary">Submit New Class</md-button>
 				</div>
diff --git a/templates/views/projects.html b/templates/views/projects.html
index 7cb6349..dd163fd 100644
--- a/templates/views/projects.html
+++ b/templates/views/projects.html
@@ -3,11 +3,14 @@
 	<md-card class="cardAllProjects">	
 		<div flex ="99" class = "allProjectsShow" layout = "row" ng-repeat = "t in arrayHolder" value = "{{t}}">
 			<div flex = "32" layout = "column" ng-repeat = "project in t" value = "{{project}}" layout-padding>
-				<!-- <a href="http://localhost:8080/home#/thisProject" style="color:black; text-decoration:none;"> -->
+				<div ng-if = "!scope.projectEmpty">
 					<md-card layout-padding ng-click = "goToProject(project.id)" style="width:32%; height:32%;" class = "projectCard">
 						{{project.id}}
 					</md-card>
-				<!-- </a> -->
+				</div>
+			</div>
+			<div ng-if = "scope.projectEmpty">
+					You Are Not Related To Any Course, You May Join Any Course You Wish.
 			</div>
 		</div>
 	</md-card>
diff --git a/templates/views/tasks.html b/templates/views/tasks.html
index 02df80d..d38e8b4 100644
--- a/templates/views/tasks.html
+++ b/templates/views/tasks.html
@@ -3,40 +3,50 @@
 		<h1 style="margin-left:15px"><i class="fa fa-file-text-o"></i> Tasks</h1>
 		<div ng-if="user.isLecturer">
 			<md-button ng-click="createTaskClicked(taskName)" ng class="md-raised md-primary">Create Task</md-button>
-		</div>
-	
-		<div>
-			<!-- <md-card> -->
-				<md-content class="md-padding">
-					<md-tabs md-dynamic-height md-border-bottom>
-						<md-tab label="Commits">
-							<md-content class="md-padding">
-								<h1 class="md-display-2">Commits</h1>
-								<p>Commits...</p>
-							</md-content>
-						</md-tab>
-						<md-tab label="Issues">
-							<md-content class="md-padding">
-								<h1 class="md-display-2">Issues</h1>
-								<p>Issues...</p>
-							</md-content>
-						</md-tab>
-						<md-tab label="Bugs">
-							<md-content class="md-padding">
-								<h1 class="md-display-2">Bugs</h1>
-								<p> Bugs Bugs Bugs..</p>
-							</md-content>
-						</md-tab>
-						<md-tab label="WhatEver">
-							<md-content class="md-padding">
-								<h1 class="md-display-2">WhatEver</h1>
-								<p>Bla Bla Bla..</p>
-							</md-content>
-						</md-tab>
-					</md-tabs>
-				</md-content>
-			<!-- </md-card> -->
-		</div>
+			
+			<div flex>
+				<md-card>
+					<md-content class="md-padding">
+						<md-tabs md-dynamic-height md-border-bottom>
+							<md-tab label="Submitted">
+								<md-content class="md-padding">
+									<h1 class="md-display-2">Submitted</h1>
+									<p>Submitted...</p>
+								</md-content>
+							</md-tab>
+							<md-tab label="Delayed">
+								<md-content class="md-padding">
+									<h1 class="md-display-2">Delayed</h1>
+									<p>Delayed...</p>
+								</md-content>
+							</md-tab>
+							<md-tab label="Not Submitted">
+								<md-content class="md-padding">
+									<h1 class="md-display-2">Not Submitted</h1>
+									<p> Not Submitted ..</p>
+								</md-content>
+							</md-tab>
+							<md-tab label="WhatEver">
+								<md-content class="md-padding">
+									<h1 class="md-display-2">WhatEver</h1>
+									<p>Bla Bla Bla..</p>
+								</md-content>
+							</md-tab>
+						</md-tabs>
+					</md-content>
+				</md-card>
+			</div>
 
+			<!-- Should Be In Table List -->
+			<div class = "allProjectsShow" flex = "99" layout = "row" ng-repeat = "t in threeSizedArray" value = "{{t}}" layout-padding>
+				<div flex = "32" layout = "column" ng-repeat = "project in t" value = "{{project}}">
+					<md-button ng-click = "goToProject(project.id)" style="width:32%; height:32%;" flex="32" layout-padding class = "md-raised">
+						<!-- <img src="{{campus.avatar_url}}" style = "width:14%; height:auto;"> -->
+						{{project.title}}
+					</md-button>
+				</div>
+			</div>
+			<!-- Should Be In Table List -->
+		</div>
 	</md-content>
 </div>
\ No newline at end of file
diff --git a/templates/views/thisProject.html b/templates/views/thisProject.html
index 7d3292f..c42991f 100644
--- a/templates/views/thisProject.html
+++ b/templates/views/thisProject.html
@@ -13,7 +13,8 @@
 								<md-button ng-click="editPressed()" class="md-raised md-primary">Edit</md-button>
 							</div>
 							<div ng-if="isEditPressed">
-								<md-button ng-click="removeProject()" class="md-raised md-primary"><i class = "fa fa-trash-o"></i></md-button>
+								<md-button ng-click="removeProject()" class="md-raised md-primary">Remove</md-button>
+								<!-- <i class = "fa fa-trash-o"></i> -->
 							</div>
 						</div>	
 					</div>
@@ -31,6 +32,38 @@
 					</md-card>
 				</div>
 			</div>
+			<div flex>
+				<md-card>
+					<md-content class="md-padding">
+						<md-tabs md-dynamic-height md-border-bottom>
+							<md-tab label="Commits">
+								<md-content class="md-padding">
+									<h1 class="md-display-2">Commits</h1>
+									<p>Commits...</p>
+								</md-content>
+							</md-tab>
+							<md-tab label="Issues">
+								<md-content class="md-padding">
+									<h1 class="md-display-2">Issues</h1>
+									<p>Issues...</p>
+								</md-content>
+							</md-tab>
+							<md-tab label="Bugs">
+								<md-content class="md-padding">
+									<h1 class="md-display-2">Bugs</h1>
+									<p> Bugs Bugs Bugs..</p>
+								</md-content>
+							</md-tab>
+							<md-tab label="WhatEver">
+								<md-content class="md-padding">
+									<h1 class="md-display-2">WhatEver</h1>
+									<p>Bla Bla Bla..</p>
+								</md-content>
+							</md-tab>
+						</md-tabs>
+					</md-content>
+				</md-card>
+			</div>
 		</div>
 	</md-content>
 </div>
\ No newline at end of file