diff --git a/controllers/addComments.php b/controllers/addComments.php
index 8f93c39..a74541b 100644
--- a/controllers/addComments.php
+++ b/controllers/addComments.php
@@ -11,7 +11,7 @@
 ?>
 
 <?php
-	if($_REQUEST['thecomment']!="")
+	if(isset($_REQUEST['thecomment']) && $_REQUEST['thecomment']!="")
 	{
 		require_once("../models/comment.php");
 		$rs = comment ::insertComment($_REQUEST['imgId'],$temp['username'], $_REQUEST['thecomment'] );
diff --git a/controllers/album.php b/controllers/album.php
index 5efe8ca..7319b63 100644
--- a/controllers/album.php
+++ b/controllers/album.php
@@ -1,7 +1,4 @@
 <?php
-error_reporting(0);
-session_start();
-
 if(isset($_SESSION['user']))
 {
 	$user=$_SESSION['user'];
@@ -9,6 +6,7 @@ if(isset($_SESSION['user']))
 else
 {
 	header("Location: ../views/signinPage.php?message=".urlencode("Login Again!"));
+	exit();
 }
 $aerror = "";
 if(isset($_POST['addAlbum']))
diff --git a/controllers/group.php b/controllers/group.php
index dd58720..0514dec 100644
--- a/controllers/group.php
+++ b/controllers/group.php
@@ -1,7 +1,4 @@
 <?php
-error_reporting(0);
-session_start();
-
 if(isset($_SESSION['user']))
 {
 	$user=$_SESSION['user'];
@@ -9,6 +6,7 @@ if(isset($_SESSION['user']))
 else
 {
 	header("Location: ../views/signinPage.php?message=".urlencode("Login Again!"));
+	exit();
 }
 $aerror = "";
 if(isset($_POST['addGroup']))
@@ -16,12 +14,13 @@ if(isset($_POST['addGroup']))
 	$name = $_POST['name'];
 	
 	include_once('../models/group.php');
-	if(group::insertGroup($name))
+	$groupId = group::insertGroup($name);
+	if($groupId)
 	{
-		if(group::insertMember($name, $user['username']))
+		if(group::insertMember($groupId, $user['username']))
 		{
 			$aerror = "Group Created!";
-			header("Location: ../views/allgroups.php");	
+			header("Location: ../views/allgroups.php");
 		}
 	}
 	else
diff --git a/controllers/logout.php b/controllers/logout.php
index 39c4ca4..40b5f42 100644
--- a/controllers/logout.php
+++ b/controllers/logout.php
@@ -1,7 +1,10 @@
 <?php
+  session_start();
   if(isset($_POST['signout']))
   {
-    $_SESSION["user"] = "";
-	header("Location: ../views/signinPage.php");	
+    session_unset();
+    session_destroy();
+	header("Location: ../views/signinPage.php");
+	exit();
   }
 ?>
\ No newline at end of file
diff --git a/controllers/member.php b/controllers/member.php
index 92dd57a..495b28b 100644
--- a/controllers/member.php
+++ b/controllers/member.php
@@ -1,7 +1,4 @@
 <?php
-error_reporting(0);
-session_start();
-
 if(isset($_SESSION['user']))
 {
 	$user=$_SESSION['user'];
@@ -9,6 +6,7 @@ if(isset($_SESSION['user']))
 else
 {
 	header("Location: ../views/signinPage.php?message=".urlencode("Login Again!"));
+	exit();
 }
 $uerror = "";
 if(isset($_POST['addToGroup']))
diff --git a/controllers/signin.php b/controllers/signin.php
index b5dbdf0..c65d4f3 100644
--- a/controllers/signin.php
+++ b/controllers/signin.php
@@ -16,7 +16,6 @@
 			{
 				$myuser= new User($username);
 				$_SESSION["user"] =$myuser->get_values();
-				var_dump($_SESSION["user"]);
 				header("Location: ../views/profilePage.php?username=".$username);
 			}
 			else
diff --git a/controllers/signup.php b/controllers/signup.php
index f518764..6a4a608 100644
--- a/controllers/signup.php
+++ b/controllers/signup.php
@@ -14,7 +14,7 @@
 		}
 		elseif($pass!=$cpass)
 			{
-				$error = "cannot leave any field empty!";
+				$error = "Passwords do not match!";
 			}
 		else
 		{
diff --git a/controllers/upload.php b/controllers/upload.php
index ee98237..5cb7f6e 100644
--- a/controllers/upload.php
+++ b/controllers/upload.php
@@ -1,7 +1,4 @@
 <?php
-error_reporting(0);
-session_start();
-
 if(isset($_SESSION['user']))
 {
 	$user=$_SESSION['user'];
@@ -9,6 +6,7 @@ if(isset($_SESSION['user']))
 else
 {
 	header("Location: ../views/signinPage.php?message=".urlencode("Login Again!"));
+	exit();
 }
 $uerror = "";
 if(isset($_POST['upload']))
diff --git a/models/Connection.php b/models/Connection.php
index f817f35..576bf8e 100644
--- a/models/Connection.php
+++ b/models/Connection.php
@@ -4,7 +4,7 @@
 	{
 		$host = "localhost";
 		$dbuser="root";
-		$pass="";
+		$pass="Admin@1234";
 		$dbname="photoshare";
 		global $conn;
 		$conn=mysqli_connect($host,$dbuser,$pass, $dbname);
diff --git a/models/DataAccessHelper.php b/models/DataAccessHelper.php
index c3e483c..4d2dc03 100644
--- a/models/DataAccessHelper.php
+++ b/models/DataAccessHelper.php
@@ -13,15 +13,13 @@ class DataAccessHelper {
 				 }
 				 $rs[] = $row;
 			}
+			$conn->close();
 			return $rs;
 		}
 		else{
-			
-			echo $conn->error;
+			$conn->close();
 			return false;
 		}
-		$conn->close();
-		return false;
 	}
 	
 	public static function insertQuery($sql){
@@ -54,7 +52,7 @@ class DataAccessHelper {
 	private static function getConnection(){
 		$servername = "localhost";
 		$username = "root";
-		$password = "";
+		$password = "Admin@1234";
 		$dbname = "photoshare";
 
 		$conn = new mysqli($servername, $username, $password, $dbname);
diff --git a/models/album.php b/models/album.php
index 6503b57..245ca30 100644
--- a/models/album.php
+++ b/models/album.php
@@ -30,8 +30,10 @@ class album{
 		$query="select * from albumdata where albumId=$albumId";
 		$result=DataAccessHelper::executeQuery($query);
 		$result2=array();
-		foreach($result as $i){
-			$result2[$i]=$result[$i]['imgId'];
+		if($result){
+			foreach($result as $row){
+				$result2[]=$row['imgId'];
+			}
 		}
 		return $result2;
 	}
diff --git a/models/group.php b/models/group.php
index 657bf55..ce971f3 100644
--- a/models/group.php
+++ b/models/group.php
@@ -5,33 +5,33 @@ require_once("../models/DataAccessHelper.php");
 class group{
 	
 	public static function insertGroup($name){
-		 $query ="insert into groups(gname) values('$name')";
-		 $result=DataAccessHelper::insertQuery($query);
-		 if($result===TRUE)
-		 {
-				return true;		  
+		 $query ="insert into `groups`(gname) values('$name')";
+		 $groupId=DataAccessHelper::insertQuerySpecial($query);
+		 if($groupId){
+				return $groupId;
 		}
 		return false;
 	}
-	
-	public static function insertMember($name,$username)
+
+	public static function insertMember($groupId,$username)
 	{
-		 $query ="insert into members(gname,username) values('$name','$username')";
+		 $query ="insert into members(groupId,username) values('$groupId','$username')";
 		 $result=DataAccessHelper::insertQuery($query);
 		 if($result===TRUE){
 			return true;
 		}
 		return false;
 	}
-	
+
 	public static function getAllUserGroups($username)
 	{
-		$query="select * from  groups join members on members.gname= groups.gname where members.username= '$username'";
+		$query="select * from `groups` join members on members.groupId= `groups`.groupId where members.username= '$username'";
 		$result=DataAccessHelper::executeQuery($query);
 		return $result;
 	}
+
 	public static function getAllUsers($groupId){
-		$query="select * from members join groups on members.gname=groups.gname where groupId= $groupId";
+		$query="select * from members join `groups` on members.groupId=`groups`.groupId where `groups`.groupId= $groupId";
 		$result=DataAccessHelper::executeQuery($query);
 		return $result;
 	}
diff --git a/models/photo.php b/models/photo.php
index dbaa830..5c6d952 100644
--- a/models/photo.php
+++ b/models/photo.php
@@ -9,16 +9,16 @@
 	public static function getImage($id){
 		$query="select * from photos where imgId='".$id."'";
 		$rs = DataAccessHelper::executeQuery($query);
-		if (sizeof($rs) > 0){
+		if ($rs && sizeof($rs) > 0){
 			return $rs;
 		}
 		return false;
 	}
-	
+
 	public static function getComments($imgId){
 		$query='select fullname,commentstr from imgcomments join users on users.username=imgcomments.username where imgId="'.$imgId.'"';
 		$rs = DataAccessHelper::executeQuery($query);
-		if (sizeof($rs) > 0){
+		if ($rs && sizeof($rs) > 0){
 			return $rs;
 		}
 		return false;
@@ -36,16 +36,16 @@
 	public static function getImageusername($username){
 		$query="select * from photos where username='".$username."'";
 		$rs = DataAccessHelper::executeQuery($query);
-		if ($rs > 0){
+		if ($rs && sizeof($rs) > 0){
 			return $rs;
 		}
 		return false;
 	}
-	
+
 	public static function getImagePublic(){
 		$query='select * from photos where shareStatus=1';
 		$rs = DataAccessHelper::executeQuery($query);
-		if ($rs > 0)
+		if ($rs && sizeof($rs) > 0)
 		{
 			return $rs;
 		}
@@ -56,14 +56,15 @@
 	public static function getShared($username){
 		$query='select * from sharedto join photos on photos.imgId=sharedto.imgId and sharedto.username="'.$username.'"';
 		$rs = DataAccessHelper::executeQuery($query);
-		if (sizeof($rs) > 0){
+		if ($rs && sizeof($rs) > 0){
 			return $rs;
 		}
 		return false;
 	}
 	
 	public static function insertImage($image,$name,$description,$access,$username,$label, $albumId){
-		$query="insert into photos (name,imageFile,shareStatus,description,username,label, albumId)values('$name','$image','$access','$description','$username','$label','$albumId')";
+		$albumIdSql = ($albumId === null) ? 'NULL' : "'$albumId'";
+		$query="insert into photos (name,imageFile,shareStatus,description,username,label, albumId)values('$name','$image','$access','$description','$username','$label',$albumIdSql)";
 		$rs = DataAccessHelper::insertQuerySpecial($query);
 		if($rs){
 			$string = $label;
@@ -71,8 +72,7 @@
 			  
 			while ($token !== false)
 				{
-					echo $rs;
-					$query="insert into imagetags(imgId,str) values('$rs','$token')";
+					$query="insert into imagetags(imgId,tag) values('$rs','$token')";
 					DataAccessHelper::insertQuerySpecial($query);
 					$token = strtok(" ");
 				}
diff --git a/models/user.php b/models/user.php
index 7ad740c..ad29663 100644
--- a/models/user.php
+++ b/models/user.php
@@ -34,15 +34,12 @@ class User {
  public function get_values(){
 	 $query = "select * from users where username='" . $this->username . "'";
 	 $rs = DataAccessHelper::executeQuery($query);
-	 
+
 	 if (sizeof($rs) > 0){
-			var_dump($rs[0]);
-			$tusername=$rs[0]["username"];
-			$tfullname=$rs[0]["fullname"];
-			$temail=$rs[0]["email"];
-		 }
-	$temp=array('username'=>$tusername,'fullname'=>$tfullname,'email'=>$temail);
-	return $temp;
+		$temp=array('username'=>$rs[0]["username"],'fullname'=>$rs[0]["fullname"],'email'=>$rs[0]["email"]);
+		return $temp;
+	 }
+	 return array('username'=>'','fullname'=>'','email'=>'');
  }
  
  public function echoevery(){
@@ -61,12 +58,12 @@ class User {
  }
 
  public static function signup($username, $fullname,$email,$password){
-	 $query ="insert into users(username,fullname,email,pass)"."VALUES('$username','$fullname', '$email',  '$pass')";
+	 $query ="insert into users(username,fullname,email,pass)"."VALUES('$username','$fullname', '$email',  '$password')";
 	 $result=DataAccessHelper::insertQuery($query);
 	 if($result===TRUE){
 		return true;
 	 }
-	 
+	 return false;
  }
 } 
 ?>
\ No newline at end of file
diff --git a/views/album.php b/views/album.php
index dfbe7d7..1bc3f98 100644
--- a/views/album.php
+++ b/views/album.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 	session_start();
 	if(isset($_SESSION['user']))
 	{
@@ -7,26 +7,23 @@
 	else
 	{
 		header("Location: ../views/signinPage.php?message=".urlencode("Login again!"));
+		exit();
 	}
+	require_once("engine.php");
+	require_once("../models/user.php");
+	require_once("../controllers/album.php");
 ?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<?php 
-		require_once("engine.php");
-		require_once("../models/user.php");
-		require_once("../controllers/album.php");
-		echo $includes;
-	?>
+	<?php echo $includes; ?>
 	<title>
 		PhotoShare
 	</title>
 </head>
 
 <body>
-	<?php 
-		echo $navbar;
-	?>
+	<?php echo $navbar; ?>
 	<div class="col-md-2" ></div>
 	<div class="col-md-8" data-spy="scroll" data-target="#mynav">
         <div class="panel panel-primary">
@@ -34,13 +31,12 @@
 				<h3>Create New Albums</h3>
 			</div>
 			<div class="panel panel-body">
-
 				<div class="col-md-12" >
 				<form action="" method="POST">
 					<div class="col-md-12" >
 					<div class="form-group">
 						<label>
-							Album Name : 
+							Album Name :
 						</label>
 						<input type="text" name= "name" class="form-control" id="name">
 					</div>
@@ -55,4 +51,4 @@
 	</div>
 	<div class="col-md-2" ></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/views/allalbums.php b/views/allalbums.php
index 892ff81..ef649f2 100644
--- a/views/allalbums.php
+++ b/views/allalbums.php
@@ -14,20 +14,10 @@
 <head>
 	<?php 
 		require_once("engine.php");
-		require_once("../models/user.php");
-		require_once("../models/photo.php");
 		require_once("../models/album.php");
-		require_once("../models/DataAccessHelper.php");
 		
 		echo $includes;
 		
-		$imgsrc = array();
-		$rs = photo ::getImageusername($temp['username']);
-		
-		foreach($rs as $row)
-		{
-			$imgsrc[] ='data:image/jpg;base64,'.base64_encode( $row['imageFile']);
-		}
 					
 	?>				
 	<title>
diff --git a/views/allphotos.php b/views/allphotos.php
index 4a7ca3d..5ee6ed7 100644
--- a/views/allphotos.php
+++ b/views/allphotos.php
@@ -57,7 +57,7 @@
 					document.getElementById("comments").innerHTML = xmlhttp.responseText;
 				}
 			};
-			xmlhttp.open("GET", "../controllers/loadComments.php?imgId= '" + id +"'", true);
+			xmlhttp.open("GET", "../controllers/loadComments.php?imgId=" + id, true);
 			xmlhttp.send();
 			
 		}
@@ -84,23 +84,9 @@
 						}
 						else
 						{
-							$id = 0;
-							$files = glob('c:/xampp/htdocs/webproject/views/images/*'); // get all file names
-							foreach($files as $file)
-							{ 
-							  if(is_file($file))
-								unlink($file);
-							}
-							
-							$paths=array();
-							
 							foreach($rs as $row)
 							{
-								$paths[]="c:/xampp/htdocs/webproject/views/images/".$row['imgId'].".jpg";
-								file_put_contents("c:/xampp/htdocs/webproject/views/images/".$row['imgId'].".jpg", $row['imageFile']);
-								
-								echo '<img class="col-md-3" height="190" width="195" id="'.$row['imgId'].'" src="data:image/jpg;base64,'.base64_encode( $row['imageFile']).'"   onclick=\'addcomments(id)\'/>';
-								$id++;
+								echo '<img class="col-md-3" height="190" width="195" id="'.$row['imgId'].'" src="data:image/jpg;base64,'.base64_encode( $row['imageFile']).'" onclick=\'addcomments(this.id)\'/>';
 							}
 						}
 						?>
diff --git a/views/group.php b/views/group.php
index 9683a93..4377bcd 100644
--- a/views/group.php
+++ b/views/group.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 	session_start();
 	if(isset($_SESSION['user']))
 	{
@@ -7,26 +7,23 @@
 	else
 	{
 		header("Location: ../views/signinPage.php?message=".urlencode("Login again!"));
+		exit();
 	}
+	require_once("engine.php");
+	require_once("../models/user.php");
+	require_once("../controllers/group.php");
 ?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<?php 
-		require_once("engine.php");
-		require_once("../models/user.php");
-		require_once("../controllers/group.php");
-		echo $includes;
-	?>
+	<?php echo $includes; ?>
 	<title>
 		PhotoShare
 	</title>
 </head>
 
 <body>
-	<?php 
-		echo $navbar;
-	?>
+	<?php echo $navbar; ?>
 	<div class="col-md-2" ></div>
 	<div class="col-md-8" data-spy="scroll" data-target="#mynav">
         <div class="panel panel-primary">
@@ -34,13 +31,12 @@
 				<h3>Create New Groups</h3>
 			</div>
 			<div class="panel panel-body">
-
 				<div class="col-md-12" >
 				<form action="" method="POST">
 					<div class="col-md-12" >
 					<div class="form-group">
 						<label>
-							Group Name : 
+							Group Name :
 						</label>
 						<input type="text" name= "name" class="form-control" id="name">
 					</div>
@@ -55,4 +51,4 @@
 	</div>
 	<div class="col-md-2" ></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/views/member.php b/views/member.php
index 27a8c69..082c6bf 100644
--- a/views/member.php
+++ b/views/member.php
@@ -1,31 +1,28 @@
-<?php
+<?php
 	session_start();
 	if(isset($_SESSION['user'])){
 		$temp=$_SESSION['user'];
 	}
 	else{
 		header("Location: ../views/signinPage.php?message=".urlencode("Login again!"));
+		exit();
 	}
+	require_once("engine.php");
+	require_once("../models/user.php");
+	require_once("../models/group.php");
+	require_once("../controllers/member.php");
 ?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<?php 
-		require_once("engine.php");
-		require_once("../models/user.php");
-		require_once("../models/group.php");
-		require_once("../controllers/member.php");
-		echo $includes;
-	?>
+	<?php echo $includes; ?>
 	<title>
 		PhotoShare
 	</title>
 </head>
 
 <body>
-	<?php 
-		echo $navbar;
-	?>
+	<?php echo $navbar; ?>
 	<div class="col-md-3" ></div>
 	<div class="col-md-6" data-spy="scroll" data-target="#mynav">
         <div class="panel panel-primary">
@@ -36,11 +33,11 @@
 				<form action="" method="POST">
 				<div class="col-md-12 form-group" >
 						<label>
-							Group : 
+							Group :
 						</label>
 						<select name = "groups">
 							<?php
-							$rs = group ::getAllUserGroups($temp['username']);
+							$rs = group::getAllUserGroups($temp['username']);
 							if($rs == false)
 							{
 								echo "No Groups are made by You!";
@@ -49,7 +46,7 @@
 							{
 								foreach($rs as $row)
 								{
-									echo '<option value="'.$row['gname'].'">'.$row['gname'].'</option>';
+									echo '<option value="'.$row['groupId'].'">'.$row['gname'].'</option>';
 								}
 							}
 						?>
@@ -57,11 +54,11 @@
 					</div>
 					<div class="form-group col-md-12">
 						<label>
-							Users : 
+							Users :
 						</label>
 						<select name = "users">
 						<?php
-							$rs = user ::loadAll();
+							$rs = user::loadAll();
 							if($rs == false)
 							{
 								echo "No Users are Signed Up!";
@@ -76,15 +73,13 @@
 						?>
 						</select>
 					</div>
-					
+
 					<div class="form-group col-md-12">
 						<input type="submit" name= "addToGroup" class="btn btn-primary" value="+ to Group" id="addToGroup">
 					</div>
 					<div class="form-group col-md-12">
 					<label>
-						<?php
-							echo $uerror;
-						?>
+						<?php echo $uerror; ?>
 					</label>
 					</div>
 					</form>
@@ -94,4 +89,4 @@
 	</div>
 	<div class="col-md-3" ></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/views/shared.php b/views/shared.php
index 7fd289c..bb76145 100644
--- a/views/shared.php
+++ b/views/shared.php
@@ -57,7 +57,7 @@
 					document.getElementById("comments").innerHTML = xmlhttp.responseText;
 				}
 			};
-			xmlhttp.open("GET", "../controllers/loadComments.php?imgId= '" + id +"'", true);
+			xmlhttp.open("GET", "../controllers/loadComments.php?imgId=" + id, true);
 			xmlhttp.send();
 			
 		}
@@ -84,23 +84,9 @@
 						}
 						else
 						{
-							$id = 0;
-							$files = glob('c:/xampp/htdocs/webproject/views/images/*'); // get all file names
-							foreach($files as $file)
-							{ 
-							  if(is_file($file))
-								unlink($file);
-							}
-							
-							$paths=array();
-							
 							foreach($rs as $row)
 							{
-								$paths[]="c:/xampp/htdocs/webproject/views/images/".$row['imgId'].".jpg";
-								file_put_contents("c:/xampp/htdocs/webproject/views/images/".$row['imgId'].".jpg", $row['imageFile']);
-								
-								echo '<img class="col-md-3" height="190" width="195" id="'.$row['imgId'].'" src="data:image/jpg;base64,'.base64_encode( $row['imageFile']).'"   onclick=\'addcomments(id)\'/>';
-								$id++;
+								echo '<img class="col-md-3" height="190" width="195" id="'.$row['imgId'].'" src="data:image/jpg;base64,'.base64_encode( $row['imageFile']).'" onclick=\'addcomments(this.id)\'/>';
 							}
 						}
 						?>
diff --git a/views/signinPage.php b/views/signinPage.php
index d83cbf7..f9f8356 100644
--- a/views/signinPage.php
+++ b/views/signinPage.php
@@ -23,26 +23,9 @@
         </script>
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta charset="utf-8">
+        <title>PhotoShare-Sign in Page</title>
 </head>
-     <title>PhotoShare-Sign in Page</title>
 <body class="container" style="background-image:url(css/backImg.jpg)" >
-<script>
-  window.fbAsyncInit = function() {
-    FB.init({
-      appId      : '199354620398049',
-      xfbml      : true,
-      version    : 'v2.5'
-    });
-  };
-
-  (function(d, s, id){
-     var js, fjs = d.getElementsByTagName(s)[0];
-     if (d.getElementById(id)) {return;}
-     js = d.createElement(s); js.id = id;
-     js.src = "//connect.facebook.net/en_US/sdk.js";
-     fjs.parentNode.insertBefore(js, fjs);
-   }(document, 'script', 'facebook-jssdk'));
-</script>
 <form action="" method="POST">
 <div class="col-sm-3">
 </div>
@@ -51,14 +34,14 @@
 		<div class="panel-heading">
 			<div class="panel-title">
 				<h1>
-					<small> 
-						<font color="azure" >  
-							Join 
+					<small>
+						<font color="azure" >
+							Join
 						</font>
-					</small> 
+					</small>
 						PhotoShare!
 					<small>
-						<font color="azure" > 
+						<font color="azure" >
 							Pick your Clicks...
 						</font>
 					</small>
@@ -76,102 +59,20 @@
 				<label for="pwd">
 					Password:
 				</label>
-				<input type="password"  name="pass" class="form-control" id="pwd">
+				<input type="password" name="pass" class="form-control" id="pwd">
 			</div>
 			<div class="form-group">
 				<input type="submit" id="login" name="login" class="btn btn-primary" value="Login" >
-				<a href="signupPage.php"  > Don't have an account? Sign up Here.</a>
+				<a href="signupPage.php"> Don't have an account? Sign up Here.</a>
 			</div>
 			<div class="form-group">
-			<?php 
-		
-
-		/* INCLUSION OF LIBRARY FILEs*/
-			require_once( 'lib/Facebook/FacebookSession.php');
-			require_once( 'lib/Facebook/FacebookRequest.php' );
-			require_once( 'lib/Facebook/FacebookResponse.php' );
-			require_once( 'lib/Facebook/FacebookSDKException.php' );
-			require_once( 'lib/Facebook/FacebookRequestException.php' );
-			require_once( 'lib/Facebook/FacebookRedirectLoginHelper.php');
-			require_once( 'lib/Facebook/FacebookAuthorizationException.php' );
-			require_once( 'lib/Facebook/GraphObject.php' );
-			require_once( 'lib/Facebook/GraphUser.php' );
-			require_once( 'lib/Facebook/GraphSessionInfo.php' );
-			require_once( 'lib/Facebook/Entities/AccessToken.php');
-			require_once( 'lib/Facebook/HttpClients/FacebookCurl.php' );
-			require_once( 'lib/Facebook/HttpClients/FacebookHttpable.php');
-			require_once( 'lib/Facebook/HttpClients/FacebookCurlHttpClient.php');
-
-		/* USE NAMESPACES */
-			
-			use Facebook\FacebookSession;
-			use Facebook\FacebookRedirectLoginHelper;
-			use Facebook\FacebookRequest;
-			use Facebook\FacebookResponse;
-			use Facebook\FacebookSDKException;
-			use Facebook\FacebookRequestException;
-			use Facebook\FacebookAuthorizationException;
-			use Facebook\GraphObject;
-			use Facebook\GraphUser;
-			use Facebook\GraphSessionInfo;
-			use Facebook\FacebookHttpable;
-			use Facebook\FacebookCurlHttpClient;
-			use Facebook\FacebookCurl;
-
-		/*PROCESS*/
-			
-			//1.Stat Session
-			 //session_start();
-			 //check if users wants to logout
-			 if(isset($_REQUEST['logout'])){
-				unset($_SESSION['fb_token']);
-			 }
-			//2.Use app id,secret and redirect url
-			 $app_id = '199354620398049';
-			 $app_secret = '6484a761305eeef7fabfbbdc963647e8';
-			 $redirect_url='http://localhost/webproject/views/profilePage.php';
-			 
-			 //3.Initialize application, create helper object and get fb sess
-			 FacebookSession::setDefaultApplication($app_id,$app_secret);
-			 $helper = new FacebookRedirectLoginHelper($redirect_url);
-			 $sess = $helper->getSessionFromRedirect();
-				
-				//check if facebook session exists
-				if(isset($_SESSION['fb_token'])){
-					$sess = new FacebookSession($_SESSION['fb_token']);
-				}
-				//logout
-				$logout = 'http://localhost/webproject/controllers/logout.php';
-				
-			//4. if fb sess exists echo name 
-				if(isset($sess)){
-					//create request object,execute and capture response
-				$request = new FacebookRequest($sess, 'GET', '/me');
-				// from response get graph object
-				$response = $request->execute();
-				$graph = $response->getGraphObject(GraphUser::className());
-				// use graph object methods to get user details
-				$name= $graph->getName();
-				$image = 'https://graph.facebook.com/'.$id.'/picture?width=300';
-				$email = $graph->getProperty('email');
-				echo "hi $name <br>";
-				echo "your email is $email <br><Br>";
-				echo "<img src='$image' /><br><br>";
-				echo "<a href='".$logout."'><button>Logout</button></a>";
-			}else{
-				//else echo login
-				echo '<a href='.$helper->getLoginUrl().'>Login with facebook</a>';
-			}
-			?>
-			</div>
-			<div class="form-group">
-				<label >
+				<label>
 					<?php echo $error;?>
 				</label>
 			</div>
 		</div>
 	</div>
-</div>      
+</div>
 </form>
 </body>
 </html>
diff --git a/views/signupPage.php b/views/signupPage.php
index 6da509a..d9528ce 100644
--- a/views/signupPage.php
+++ b/views/signupPage.php
@@ -65,8 +65,8 @@
             });
             
     </script>
-        <script src="bootstrap.min.js"></script>
-        <script src="angular.min.js"></script>
+        <script src="js/bootstrap.min.js"></script>
+        <script src="js/angular.min.js"></script>
        
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta charset="utf-8">
diff --git a/views/upload.php b/views/upload.php
index eea7e48..fd1a1c9 100644
--- a/views/upload.php
+++ b/views/upload.php
@@ -1,31 +1,28 @@
-<?php
+<?php
 	session_start();
 	if(isset($_SESSION['user'])){
 		$temp=$_SESSION['user'];
 	}
 	else{
 		header("Location: ../views/signinPage.php?message=".urlencode("Login again!"));
+		exit();
 	}
+	require_once("engine.php");
+	require_once("../models/user.php");
+	require_once("../models/album.php");
+	require_once("../controllers/upload.php");
 ?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<?php 
-		require_once("engine.php");
-		require_once("../models/user.php");
-		require_once("../models/album.php");
-		require_once("../controllers/upload.php");
-		echo $includes;
-	?>
+	<?php echo $includes; ?>
 	<title>
 		PhotoShare
 	</title>
 </head>
 
 <body>
-	<?php 
-		echo $navbar;
-	?>
+	<?php echo $navbar; ?>
 	<div class="col-md-3" ></div>
 	<div class="col-md-6" data-spy="scroll" data-target="#mynav">
         <div class="panel panel-primary">
@@ -37,19 +34,19 @@
 				<div class="col-md-12" >
 					<div class="form-group">
 						<label>
-							Label : 
+							Label :
 						</label>
 						<input type="text" name= "label" class="form-control" id="label">
 					</div>
 					<div class="form-group">
 						<label>
-							Description : 
+							Description :
 						</label>
 						<input type="text" name= "description" class="form-control" id="description">
 					</div>
 					<div class="form-group">
 						<label>
-							Public : 
+							Public :
 						</label>
 						<select name = "access">
 							<option value='0'>No</option>
@@ -58,12 +55,12 @@
 					</div>
 					<div class="form-group">
 						<label>
-							Album : 
+							Album :
 						</label>
 						<select name = "albumName">
 						<option value=''>No Album</option>
 						<?php
-							$rs = album ::getAllUserAlbum($temp['username']);
+							$rs = album::getAllUserAlbum($temp['username']);
 							if($rs == false)
 							{
 								echo "No Albums Present!";
@@ -81,11 +78,11 @@
 					<div class="form-group">
 						<input type="file" name= "file" class="btn btn-info" id="file">
 					</div>
-					
+
 					<div class="form-group">
 						<input type="submit" name= "upload" class="btn btn-primary" value="Upload" id="upload">
 					</div>
-					
+
 					<div class="form-group">
 						<label>
 							<?php echo $uerror;?>
@@ -98,4 +95,4 @@
 	</div>
 	<div class="col-md-3" ></div>
 </body>
-</html>
\ No newline at end of file
+</html>