diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp
index 9d78b48..1d54d91 100644
--- a/WebContent/WEB-INF/jsps/addDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp
@@ -5,7 +5,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-
+<script src="../scripts/photo.js"></script>
 <style>
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
 @import url('https://fonts.googleapis.com/icon?family=Material+Icons');
@@ -201,6 +201,7 @@ h3{
 <title>Add Deficiency: ${unit.homeEnrollmentNumber}</title>
 
 <script>
+var save = false;
     function Validate() {
             if (ValidateCategories() && ValidateLocation()) {
                 return true;
@@ -240,14 +241,19 @@ h3{
                 return true;
             }
         }
+        
+        function reallyClose() {
+            confirm("You have not saved a photo. Are you sure you want to leave?");
+        }
 </script>
 
 	<div style="margin: 2%">
+	<legend><h2>Enter or Edit Deficiency Information</h2></legend>
 		<c:url value="/saveDeficiency" var="url" />
 		<form name="form" class="form-horizontal" method="post" onsubmit="return Validate()" action="${url}">
 		<div class="jumbotron" id="con">
 			<fieldset>
-				<legend>Enter or Edit Deficiency Information</legend>
+				
 				<br>
 				<div class="alert alert-danger collapse" id="alert" >
                 	<div id="selectCategory" class="collapse">Please select a category.</div>
@@ -293,6 +299,18 @@ h3{
 					</div>
 				</div>
 				
+				<div class="form-group">
+                	<label for="defPhoto" class="col-lg-1 control-label">Deficiency Photo</label>
+                	<div class="col-lg-8">
+                		<input path="defPhoto" name="defPhoto" class="form-control" id="defPhoto" readonly/> 
+                	</div>
+                	<div class="col-lg-2">
+					<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">
+                    Add Photo
+                  </button>
+					</div>
+                </div>
+				
 				<div class="form-group">
 					<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
 					<div class="col-lg-10">
@@ -315,39 +333,65 @@ h3{
 					</div>
 				</div>
 
-				<input type="hidden" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
+				<input type="hidden" id="homeEnrollmentNumber" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 				
-				<input type="submit" value="Save Deficiency" class="btn btn-primary" id="btnXlg2" style="margin-left: 8.33333333333%" />
+				
+			</fieldset>
+			
+			  
+
+			</div>
+			<input type="submit" value="Save Deficiency" class="btn btn-primary" id="btnXlg2" style="margin-left: 8.33333333333%" />
 					
 					
 			    <c:url value="/displayUnitDeficiencies/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
 			    <a href="${displayUnitDeficiencies}" class="pull-right btn btn-default" id="btnXlg" style="margin-right: 8.33333333333%">Back</a>
-
-			</fieldset>
-			<!--
-			<div class="container2">
-
-			  <div class="app2">
-
-			    <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
-			    <video id="camera-stream"></video>
-			    <img id="snap">
-
-			    <p id="error-message"></p>
-
-			    <div class="controls">
-			      <a href="#" id="delete-photo" title="Delete Photo" class="disabled"><i class="material-icons">delete</i></a>
-			      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
-			      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" class="disabled"><i class="material-icons">file_download</i></a>
-			    </div>
-
-
-			    <canvas></canvas>
-			  </div>
-			</div>  This code works but is not for prototype release will be in the final prog. version-->
-
-			</div>
+			
 		</form>
+		<br />
+		<br />
+		
+		<legend> </legend>
+	</div>
+	
+<div class="modal fade" id="myModal">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+            <h4 class="modal-title">Deficiency Photo</h4>
+          </div>
+          <div class="modal-body">
+            <div class="container2">
+
+              <div class="app2">
+
+                <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
+                <video id="camera-stream"></video>
+                <img id="snap">
+
+                <p id="error-message"></p>
+
+                <div class="controls">
+                  <a href="#" id="delete-photo" title="Redo Photo" class="disabled">
+                    <i class="material-icons">replay</i></a>
+                  <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
+                  <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png"
+                    title="Save Photo" class="disabled" onclick="saveDone()">
+                    <i class="material-icons">done</i></a>
+                </div>
 
-	</div>
\ No newline at end of file
+    <canvas></canvas>
+  </div>
+</div>
+			
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                  
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/addDeficiency2.jsp b/WebContent/WEB-INF/jsps/addDeficiency2.jsp
index df77148..05d1d9c 100644
--- a/WebContent/WEB-INF/jsps/addDeficiency2.jsp
+++ b/WebContent/WEB-INF/jsps/addDeficiency2.jsp
@@ -5,8 +5,186 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-
+<script src="../scripts/photo.js"></script>
 	<style>
+	@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
+@import url('https://fonts.googleapis.com/icon?family=Material+Icons');
+
+*{
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+}
+
+html{
+    background-color: #fff;
+    font:normal 16px/1.5 sans-serif;
+    color: #333;
+}
+
+h3{
+    font: normal 32px/1.5 'Open Sans', sans-serif;
+    color: #2c3e50;
+    margin: 50px 0;
+    text-align: center;
+}
+
+
+.container2{
+    max-width: 1000px;
+    margin: 50px auto;
+    padding: 20px;
+    background-color: #efefef;
+}
+
+.app2{
+    width: 100%;
+    position: relative;
+}
+
+.app2 #start-camera{
+    display: none;
+    border-radius: 3px;
+    max-width: 400px;
+    color: #fff;
+    background-color: #448AFF;
+    text-decoration: none;
+    padding: 15px;
+    opacity: 0.8;
+    margin: 50px auto;
+    text-align: center;
+}
+
+.app2 video#camera-stream{
+    display: none;
+    width: 100%;
+}
+
+.app2 img#snap{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10;
+    display: none;
+}
+
+.app2 #error-message{
+    width: 100%;
+    background-color: #ccc;
+    color: #9b9b9b;
+    font-size: 28px;
+    padding: 200px 100px;
+    text-align: center;
+    display: none;
+}
+
+.app2 .controls{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 20;
+
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    padding: 30px;
+    display: none;
+}
+
+.app2 .controls a{
+    border-radius: 50%;
+    color: #fff;
+    background-color: #111;
+    text-decoration: none;
+    padding: 15px;
+    line-height: 0;
+    opacity: 0.7;
+    outline: none;
+    -webkit-tap-highlight-color: transparent;
+}
+
+.app2 .controls a:hover{
+    opacity: 1;
+}
+
+.app2 .controls a.disabled{
+    background-color: #555;
+    opacity: 0.5;
+    cursor: default;
+    pointer-events: none;
+}
+
+.app2 .controls a.disabled:hover{
+    opacity: 0.5;
+}
+
+.app2 .controls a i{
+    font-size: 18px;
+}
+
+.app2 .controls #take-photo i{
+    font-size: 32px;
+}
+
+.app2 canvas{
+    display: none;
+}
+
+
+
+.app2 video#camera-stream.visible,
+.app2 img#snap.visible,
+.app2 #error-message.visible
+{
+    display: block;
+}
+
+.app2 .controls.visible{
+    display: flex;
+}
+
+
+
+@media(max-width: 1000px){
+    .container2{
+        margin: 40px;
+    }
+
+    .app2 #start-camera.visible{
+        display: block;
+    }
+
+    .app2 .controls a i{
+        font-size: 16px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 24px;
+    }
+}
+
+
+@media(max-width: 600px){
+    .container2{
+        margin: 10px;
+    }
+
+    .app2 #error-message{
+        padding: 80px 50px;
+        font-size: 18px;
+    }
+
+    .app2 .controls a i{
+        font-size: 12px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 18px;
+    }
+}
 #con {
 	background-color: #EDEEFF;
 	border-radius: 15px;
@@ -67,7 +245,7 @@
 	<div style="margin: 2%">
 		<c:url value="/saveDeficiency2" var="url" />
 		<form name="form" class="form-horizontal" method="post" onsubmit="return Validate()" action="${url}">
-
+		<div class="jumbotron" id="con">
 			<fieldset>
 				<legend>Enter or Edit Information</legend>
 
@@ -115,6 +293,18 @@
 					</div>
 				</div>
 				
+				<div class="form-group">
+                	<label for="defPhoto" class="col-lg-1 control-label">Deficiency Photo</label>
+                	<div class="col-lg-8">
+                		<input path="defPhoto" name="defPhoto" class="form-control" id="defPhoto" readonly/> 
+                	</div>
+                	<div class="col-lg-2">
+					<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">
+                    Add Photo
+                  </button>
+					</div>
+                </div>
+				
 				<div class="form-group">
 					<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
 					<div class="col-lg-10">
@@ -136,17 +326,57 @@
                         </select>
 					</div>
 				</div>
-
-				<input type="hidden" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
+</div>
+				<input type="hidden" id="homeEnrollmentNumber" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 				
 				<input type="submit" value="Save Deficiency" class="btn btn-primary" id="btnXlg2" style="margin-left: 8.33333333333%" />
 					
 					
 			    <c:url value="/displayUnitDeficiencies2/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies2" />
-			    <a href="${displayUnitDeficiencies2}" id="btnXlg2" class="pull-right btn btn-default">Back</a>
+			    <a href="${displayUnitDeficiencies2}" id="btnXlg2" class="pull-right btn btn-default" style="margin-right: 8.33333333333%">Back</a>
 
 			</fieldset>
 		</form>
 
-	</div>
\ No newline at end of file
+	</div>
+	<div class="modal fade" id="myModal">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <div class="container2">
+
+						  <div class="app2">
+			
+						    <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
+						    <video id="camera-stream"></video>
+						    <img id="snap">
+			
+						    <p id="error-message"></p>
+			
+						    <div class="controls">
+						      <a href="#" id="delete-photo" title="Redo Photo" class="disabled"><i class="material-icons">replay</i></a>
+						      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
+						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" 
+						      onclick="saveDone()" class="disabled">
+						      	<i class="material-icons">done</i></a>
+						    </div>
+
+
+			    <canvas></canvas>
+			  </div>
+			</div>
+			
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="saveDone()">Close</button>
+                  
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp
index a1e37f9..1b95d8f 100644
--- a/WebContent/WEB-INF/jsps/addSignOff.jsp
+++ b/WebContent/WEB-INF/jsps/addSignOff.jsp
@@ -25,13 +25,71 @@
 	margin: 2%
 }
 #acc2 {
-    padding: 21px 26px;
     font-size: 16px;
     line-height: normal;
     border-radius: 8px;
     color:white;
+    width: 170px;
+    height: 70px;
     }
 </style>
+
+<script type="text/javascript">
+var e;
+var used;
+
+function hide(){
+	//used = document.getElementById("repName").value;
+	//disable save on load
+	$( "#btnXlg2" ).prop( "disabled", true );
+	document.getElementById("btnXlg").style.visibility = 'visible';
+	document.getElementById("btnXlg2").style.visibility = 'visible';
+
+if (used === ""){
+	//alert(used);
+	document.getElementById("btnXlg").style.visibility = 'visible';
+	}
+}
+
+function showSave(){
+	$( "#btnXlg2" ).prop( "disabled", false );
+	//$( "#nextBtn" ).prop( "disabled", false );
+	//	$('a').disable(false);
+	//document.getElementById("saveBtn").style.visibility = 'visible';
+}
+
+function enableNextBtn(){
+	$('a').disable(false);
+}
+
+function disableNextBtn(){
+	$('a').disable(false);
+}
+
+//Function to enable disable Next button HREF
+$(function() {
+    jQuery.fn.extend({
+        disable: function(state) {
+            return this.each(function() {
+                var $this = $(this);
+                if($this.is('input'))
+                    this.disabled = state;
+                else
+                    $this.toggleClass('disabled', state);
+            });
+        }
+    });
+    
+   // $('a').disable(true);
+   
+    $('body').on('click', 'a.disabled', function(event) {
+        event.preventDefault();
+    });
+}); 
+
+</script>
+
+
 <title>SignOff Form</title>
 
 <body onload="hide()">
@@ -80,7 +138,7 @@
 					</div>
 				</div>
 				<!-- row 4 -->
-				<input type="hidden" name="homeEnrollmentNumber" value="${form.homeEnrollmentNumber}"/>
+				<input type="hidden" id="homeEnrollmentNumber" name="homeEnrollmentNumber" value="${form.homeEnrollmentNumber}"/>
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 				<div class="form-group">
 				<!-- <input type="submit" value="Save" id="btnXlg2" class="pull-right btn btn-primary" /> -->
@@ -96,7 +154,7 @@
     					</div>
 					</div>
 					
-					<div><button id="acc2" onclick="accept()" class="btn btn-primary btn-sm" type="button">Accept</button></div>
+					<div><button id="acc2" onclick="accept2()" class="btn btn-primary btn-sm" type="button">Accept</button></div>
 					<div id="acc1"></div>
 					<br><br>
 					<div><button onclick="clearSig()" id="btnXlg" class="btn btn-default btn-sm" type="button">Redo</button></div>
@@ -140,20 +198,19 @@
 				
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 				
-				<div class="form-group">
+				<div class="form-group" >
 			        <c:url value="/" var="home" />
-			        <input type="submit" value="Save and Proceed" id="btnXlg2" class="pull-right btn btn-success" />
-				<!-- <a href="${home}" class="pull-right btn btn-success" id="btnXlg2">Finish</a> -->
+			        <input type="submit" value="Save and Proceed" id="btnXlg2" class="pull-right btn btn-success" style="margin: 2%"/>
+				<!-- <a href="${home}" class="pull-right btn btn-success" id="saveBtn">Finish</a> -->
+				
+				
 				</fieldset>
 </form>
+			        <c:url value="/displayUnitDeficiencies/${form.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
+					<a href="${displayUnitDeficiencies}" class="pull-left btn btn-default" id="btnXlg" style="margin: 2%">Back</a>
 				</div>
 
-				<div class="form-group">
 				
-			        <c:url value="/displayUnitDeficiencies/${form.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
-					<a href="${displayUnitDeficiencies}" class="pull-left btn btn-default" id="btnXlg">Back</a>
-
-				</div>
 				</div>
 				<br />
 				<br />
diff --git a/WebContent/WEB-INF/jsps/buildInspection.jsp b/WebContent/WEB-INF/jsps/buildInspection.jsp
index 964a667..4a3f03e 100644
--- a/WebContent/WEB-INF/jsps/buildInspection.jsp
+++ b/WebContent/WEB-INF/jsps/buildInspection.jsp
@@ -33,7 +33,7 @@
 #topEntry{
 	margin: 1%;
 }
-#saveBtn{
+#saveBtn2{
     padding: 24px 34px;
     font-size: 16px;
     line-height: normal;
@@ -231,8 +231,8 @@
 <br>
 				<div class="form-group">
 			        <c:url value="/displayUnitDeficiencies2/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies2" />
-				<!-- 	<a href="${displayUnitDeficiencies2}" class="pull-right btn btn-success" id="nextBtn">Next</a> -->
-					<input type="submit" value="Save and Proceed" class="pull-right btn btn-success" id="saveBtn"/>
+				<!-- 	<a href="${displayUnitDeficiencies2}" class="pull-right btn btn-success" id="nextBtn2">Next</a> -->
+					<input type="submit" value="Save and Proceed" class="pull-right btn btn-success" id="saveBtn2"/>
 				<br />
 				<br />
 				
diff --git a/WebContent/WEB-INF/jsps/default.jsp b/WebContent/WEB-INF/jsps/default.jsp
index da36bd5..1a23dc1 100644
--- a/WebContent/WEB-INF/jsps/default.jsp
+++ b/WebContent/WEB-INF/jsps/default.jsp
@@ -11,7 +11,6 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 
-
 <script src="scripts/script.js"></script>
 <script src="../scripts/script.js"></script>
 
@@ -33,6 +32,8 @@
 
 
 <!-- Latest compiled and minified CSS -->
+<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
+      rel="stylesheet">
 <link rel="stylesheet"
 	href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
 	integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp
index 8182549..dee9394 100644
--- a/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp
+++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp
@@ -29,4 +29,5 @@
 
        	<c:url value="/workOrderHome" var="backUrl" />
        	<a href="${backUrl}" id="btnXlg" class="btn btn-default">Back</a>
+       	
     </div>
diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
index 673c5fa..a857681 100644
--- a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
@@ -8,6 +8,7 @@
     <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
     <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
     <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+    <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
     <style>
     #con {
@@ -25,38 +26,66 @@
 <div class="jumbotron" id="con">
 <center><h2>Deficiency List</h2></center>
 	<div style="margin: 2%">
-	<legend>Work Assigned to ${deficiency.constructionPersonnel}</legend>
+	<legend>Work Assigned to ${constructionPersonnel}</legend>
 		<div class="list-group">
 		<table class="table table-striped table-hover">
 		  <thead>
 		    <tr>
-		    <th>Project</th>
+		      <th>Project</th>
 		      <th>Unit</th>
 		      <th>Location</th>
 		      <th>Deficiency Type</th>
 		      <th>Notes</th>
+		      <th>Deadline</th>
 		      <th></th>
-		      <th></th>
+		      <th style="text-align: center;">Status</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			<c:forEach var="deficiency" items="${deficiencyList}">
 				<tr>
-				<td>${deficiency.id}</td>
-				<td>${deficiency.id}</td>
+				<td>${deficiency.projectName}</td>
+				<td>${deficiency.unitNum}</td>
 				<td>${deficiency.location}</td>
 				<td>${deficiency.category}</td>
 				<td>${deficiency.description}</td>
+				<td><fmt:formatDate value="${deficiency.deadline}" pattern="yyyy-MM-dd" /></td>
+
 				<td>
+                    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#photoModal${deficiency.id}">
+                        View Photo
+                    </button>
+                </td>
+
+                <div class="modal fade" id="photoModal${deficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <img id="defImage" src="../defImage/${deficiency.homeEnrollmentNumber}/${deficiency.id}" />
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
+
+				<td style="text-align: center;">
 					<c:choose>
 	              <c:when test="${deficiency.status}">
 		              <c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
-					    <a href="${completeUrl}" class="btn btn-success pull-right">Complete</a>
+					    <a href="${completeUrl}" id="toggleBtnID" class="btn btn-success">Complete</a>
 
 	              </c:when>
 	              <c:otherwise>
 	                <c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
-					    <a href="${completeUrl}" class="btn btn-warning pull-right">Incompleted</a>
+					    <a href="${completeUrl}" id="toggleBtnID" class="btn btn-warning">Incomplete</a>
 	              </c:otherwise>
 	            	</c:choose>
 
diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
index f3c3e5f..ac58dc0 100644
--- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
@@ -46,6 +46,7 @@ table{
 		      <th>Deficiency Type</th>
 		      <th>Description</th>
 		      <th></th>
+		      <th></th>
 		    </tr>
 		  </thead>
 		  <tbody>
@@ -56,9 +57,57 @@ table{
 				<td>${unitDeficiency.category}</td> 
 				<td>${unitDeficiency.description}</td>
 				<td>
-				    <c:url value="/deleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
-				    <a href="${deleteUrl}" class="btn btn-danger pull-right" style="margin:1%;">Delete</a>
+                    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#photoModal${unitDeficiency.id}">
+                        View Photo
+                    </button>
+                </td>
+
+                <div class="modal fade" id="photoModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <img id="defImage" src="defImage/${unit.homeEnrollmentNumber}/${unitDeficiency.id}" />
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
+
+				<td>
+				    <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal${unitDeficiency.id}">
+                        Delete
+                    </button>
 				</td>
+
+                <div class="modal fade" id="myModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Confirm Delete</h4>
+                      </div>
+                      <div class="modal-body">
+                        Are you sure you want to delete deficiency ${unitDeficiency.id}?
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+				        <c:url value="/deleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
+                        <a href="${deleteUrl}" class="btn btn-danger" style="margin:1%;">Delete</a>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
+
 				</tr>
 			</c:forEach>
 			</tbody>
diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp
index 713abc9..172fae2 100644
--- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp
@@ -48,6 +48,7 @@ table{
 		      <th>Deficiency Type</th>
 		      <th>Description</th>
 		      <th></th>
+		      <th></th>
 		    </tr>
 		  </thead>
 		  <tbody>
@@ -57,10 +58,58 @@ table{
 				<td>${unitDeficiency.location}</td>
 				<td>${unitDeficiency.category}</td> 
 				<td>${unitDeficiency.description}</td>
+
+				<td>
+                    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#photoModal${unitDeficiency.id}">
+                        View Photo
+                    </button>
+                </td>
+
+                <div class="modal fade" id="photoModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <img id="defImage" src="defImage/${unit.homeEnrollmentNumber}/${unitDeficiency.id}" />
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
+
 				<td>
-				    <c:url value="/deleteDeficiency2/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl2" />
-				    <a href="${deleteUrl2}" class="btn btn-danger pull-right">Delete</a>
-				</td>
+                    <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal${unitDeficiency.id}">
+                        Delete
+                    </button>
+                </td>
+
+                <div class="modal fade" id="myModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Confirm Delete</h4>
+                      </div>
+                      <div class="modal-body">
+                        Are you sure you want to delete deficiency ${unitDeficiency.id}?
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                        <c:url value="/deleteDeficiency2/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
+                        <a href="${deleteUrl}" class="btn btn-danger" style="margin:1%;">Delete</a>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
 				</tr>
 			</c:forEach>
 			</tbody>
diff --git a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp
index c5bb370..17aa7d6 100644
--- a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp
@@ -18,12 +18,14 @@
 	border-radius: 15px;
 }
 #acc2 {
-    padding: 21px 26px;
     font-size: 16px;
     line-height: normal;
     border-radius: 8px;
     color:white;
+    width: 170px;
+    height: 70px;
     }
+
 #nextBtn {
     padding: 24px 34px;
     font-size: 16px;
@@ -243,7 +245,7 @@
     						<canvas id="signature" height="200px" />
     					</div>
 					</div>
-					
+
 					<div><button id="acc2" class="btn btn-primary" onclick="acceptSig()" type="button">Accept</button></div>
 					<div id="acc1"></div>
 					<br><br>
diff --git a/WebContent/WEB-INF/jsps/editDeficiency.jsp b/WebContent/WEB-INF/jsps/editDeficiency.jsp
index 61f0f39..5a0b5fb 100644
--- a/WebContent/WEB-INF/jsps/editDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/editDeficiency.jsp
@@ -27,10 +27,189 @@
 	src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
 	integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
 	crossorigin="anonymous"></script>
-	
+<script src="../../scripts/photo.js"></script>
 <link rel="stylesheet" type="text/css" href="/spring/css/style.css">
 
 <style>
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
+@import url('https://fonts.googleapis.com/icon?family=Material+Icons');
+
+*{
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+}
+
+html{
+    background-color: #fff;
+    font:normal 16px/1.5 sans-serif;
+    color: #333;
+}
+
+h3{
+    font: normal 32px/1.5 'Open Sans', sans-serif;
+    color: #2c3e50;
+    margin: 50px 0;
+    text-align: center;
+}
+
+
+.container2{
+    max-width: 1000px;
+    margin: 50px auto;
+    padding: 20px;
+    background-color: #efefef;
+}
+
+.app2{
+    width: 100%;
+    position: relative;
+}
+
+.app2 #start-camera{
+    display: none;
+    border-radius: 3px;
+    max-width: 400px;
+    color: #fff;
+    background-color: #448AFF;
+    text-decoration: none;
+    padding: 15px;
+    opacity: 0.8;
+    margin: 50px auto;
+    text-align: center;
+}
+
+.app2 video#camera-stream{
+    display: none;
+    width: 100%;
+}
+
+.app2 img#snap{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10;
+    display: none;
+}
+
+.app2 #error-message{
+    width: 100%;
+    background-color: #ccc;
+    color: #9b9b9b;
+    font-size: 28px;
+    padding: 200px 100px;
+    text-align: center;
+    display: none;
+}
+
+.app2 .controls{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 20;
+
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    padding: 30px;
+    display: none;
+}
+
+.app2 .controls a{
+    border-radius: 50%;
+    color: #fff;
+    background-color: #111;
+    text-decoration: none;
+    padding: 15px;
+    line-height: 0;
+    opacity: 0.7;
+    outline: none;
+    -webkit-tap-highlight-color: transparent;
+}
+
+.app2 .controls a:hover{
+    opacity: 1;
+}
+
+.app2 .controls a.disabled{
+    background-color: #555;
+    opacity: 0.5;
+    cursor: default;
+    pointer-events: none;
+}
+
+.app2 .controls a.disabled:hover{
+    opacity: 0.5;
+}
+
+.app2 .controls a i{
+    font-size: 18px;
+}
+
+.app2 .controls #take-photo i{
+    font-size: 32px;
+}
+
+.app2 canvas{
+    display: none;
+}
+
+
+
+.app2 video#camera-stream.visible,
+.app2 img#snap.visible,
+.app2 #error-message.visible
+{
+    display: block;
+}
+
+.app2 .controls.visible{
+    display: flex;
+}
+
+
+
+@media(max-width: 1000px){
+    .container2{
+        margin: 40px;
+    }
+
+    .app2 #start-camera.visible{
+        display: block;
+    }
+
+    .app2 .controls a i{
+        font-size: 16px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 24px;
+    }
+}
+
+
+@media(max-width: 600px){
+    .container2{
+        margin: 10px;
+    }
+
+    .app2 #error-message{
+        padding: 80px 50px;
+        font-size: 18px;
+    }
+
+    .app2 .controls a i{
+        font-size: 12px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 18px;
+    }
+}
+
 #con {
 	background-color: #EDEEFF;
 	border-radius: 15px;
@@ -135,6 +314,18 @@
 					</div>
 				</div>
 				
+				<!-- <div class="form-group">
+                	<label for="defPhoto" class="col-lg-1 control-label">Deficiency Photo</label>
+                	<div class="col-lg-8">
+                		<input path="defPhoto" name="defPhoto" class="form-control" id="defPhoto" readonly/> 
+                	</div>
+                	<div class="col-lg-2">
+					<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModalPic">
+                    Add/Change Photo
+                  </button>
+					</div>
+                </div> -->
+				
 				<div class="form-group">
 					<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
 					<div class="col-lg-8">
@@ -190,7 +381,45 @@
 			</fieldset>
 			</div>
 		</form>
-
 	</div>
+	<div class="modal fade" id="myModalPic">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <div class="container2">
+
+						  <div class="app2">
+			
+						    <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
+						    <video id="camera-stream"></video>
+						    <img id="snap">
+			
+						    <p id="error-message"></p>
+			
+						    <div class="controls">
+						      <a href="#" id="delete-photo" title="Redo Photo" class="disabled"><i class="material-icons">replay</i></a>
+						      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
+						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" class="disabled">
+						      	<i class="material-icons">done</i></a>
+						    </div>
+
+
+			    <canvas></canvas>
+			  </div>
+			</div>
+			
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="saveDone()">Close</button>
+                  
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
 </body>
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/footer.jsp b/WebContent/WEB-INF/jsps/footer.jsp
index 0b56c64..239bff4 100644
--- a/WebContent/WEB-INF/jsps/footer.jsp
+++ b/WebContent/WEB-INF/jsps/footer.jsp
@@ -6,6 +6,7 @@
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
-<div style="text-align:center;">Copyright 2016 Jack Software</div>
+<div style="text-align:center;"><img src="https://s14.postimg.org/56v67gjap/abode.png" width="50px" style="margin-bottom:0.5%"><br>
+Copyright 2016 Jack Software</div>
 <br />
 <br />
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/header.jsp b/WebContent/WEB-INF/jsps/header.jsp
index b69cd41..ab37c0a 100644
--- a/WebContent/WEB-INF/jsps/header.jsp
+++ b/WebContent/WEB-INF/jsps/header.jsp
@@ -15,6 +15,11 @@
 	<c:url value="/selectReport" var="reports" />
 	<c:url value="/help" var="help" />
 
+<style>
+.navbar-icons{
+    font-size: 16px;
+}
+</style>
 
 		<nav class="navbar navbar-default">
           <div class="container-fluid">
@@ -25,7 +30,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
               </button>
-              <a class="navbar-brand" href="${home}">aBode</a>
+              <a class="navbar-brand" href="${home}"><i class="material-icons navbar-icons">home</i> aBode</a>
             </div>
 
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -46,12 +51,12 @@
               </ul>
               <form class="navbar-form navbar-left" role="search" action="workOrderDisplayUnitDeficiencies">
                 <div class="form-group">
-                  <input id="homeEnrollmentNumberNav" name="homeEnrollmentNumber" type="text" class="form-control" placeholder="Home Enrollment Number" required="required">
+                  <input id="homeEnrollmentNumberNav" name="homeEnrollmentNumber" onkeypress='return event.charCode >= 48 && event.charCode <= 57' type="text" class="form-control" placeholder="Home Enrollment Number" required="required">
                 </div>
                 <button type="submit" class="btn btn-default">Submit</button>
               </form>
               <ul class="nav navbar-nav navbar-right">
-                <li><a href="${help}">Help</a></li>
+                <li><a href="${help}"><i class="material-icons navbar-icons">settings</i> Help</a></li>
               </ul>
             </div>
           </div>
diff --git a/WebContent/WEB-INF/jsps/help.jsp b/WebContent/WEB-INF/jsps/help.jsp
index d9a37b2..8c7df21 100644
--- a/WebContent/WEB-INF/jsps/help.jsp
+++ b/WebContent/WEB-INF/jsps/help.jsp
@@ -9,7 +9,7 @@
 
 <style>
 #feedbackDiv {
-	width: 50%;
+	width: 90%;
 }
 
 #contactTable {
@@ -151,19 +151,19 @@ table td {
 			<div style="margin: 2%">
 				<legend>Submit a Question or Feedback</legend>
 				<div id="feedbackDiv" class="form-group">
-					<div class="col-lg-7 control-label">
+					<div class="col-lg-10 control-label">
 						<input type="text" class="form-control" placeholder="Subject">
 					</div>
 					<br>
 					<br>
-					<div class="col-xs-7 control-label">
+					<div class="col-lg-10 control-label">
 						<textarea rows="9" maxlength="350" class="form-control pull-left"
 							placeholder="Short entry (350 character limit)">
 				</textarea>
 					</div>
 					<br>
 					<br>
-					<div class="col-lg-7 control-label">
+					<div class="col-lg-7 control-label" style="margin:1%">
 						<address> <form id="reset" >
 							<a
 								href="mailto:exampleAbode@exampleAbode.com? subject=Feedback&body=Message"
diff --git a/WebContent/WEB-INF/jsps/home.jsp b/WebContent/WEB-INF/jsps/home.jsp
index 5c14ca3..518edf7 100644
--- a/WebContent/WEB-INF/jsps/home.jsp
+++ b/WebContent/WEB-INF/jsps/home.jsp
@@ -13,7 +13,7 @@ Extra Large Button CSS
 */
 .btn-xl {
 	padding: 34px 40px;
-	font-size: 25px;
+	font-size: 35px;
 	border-radius: 8px;
 	text-align: center;
 	margin: 20px;
@@ -27,10 +27,18 @@ Extra Large Button CSS
 	color: black;
 }
 
+.home-icons {
+    font-size: 40px;
+}
+
+.col-sm-2 {
+    width: 14%;
+}
+
 
 </style>
 
-	<div class="">
+	<div class="row row-centered text-center">
 	
 		<div class="row row-centered text-center">
 
@@ -41,31 +49,28 @@ Extra Large Button CSS
 			<c:url value="/workOrderHome" var="workOrderHome" />
 			<c:url value="/help" var="help" />
 			<c:url value="/buildInspection" var="buildInspection" />
-			
 
 		</div>
 
-		<div class="row">
+		<div class="row row-centered">
 			<div class="col-sm-2 text-center"></div>
-			<a href="${displayUnitInformation}"	class="col-sm-4 btn-xl btn-inverse">Fill out PDI</a>
-			<a href="${buildInspection}" class="col-sm-4 btn-xl btn-inverse">Build	Inspection</a>
-
+			<a href="${displayUnitInformation}"	class="col-sm-4 btn-xl btn-inverse"><i class="material-icons home-icons" >create</i> PDI</a>
+			<a href="${buildInspection}" class="col-sm-4 btn-xl btn-inverse"><i class="material-icons home-icons" >domain</i> Inspection</a>
+            <div class="col-sm-2 text-center"></div>
 		</div>
 
 		<div class="row">
 			<div class="col-sm-2 text-center"></div>
-			<a href="${workOrderHome}" class="col-sm-4 btn-xl btn-inverse btn-xl">View Work Orders</a>
-			<a href="${selectReport}" class="col-sm-4 btn-xl btn-inverse btn-xl">View Reports</a>
+			<a href="${workOrderHome}" class="col-sm-4 btn-xl btn-inverse btn-xl"><i class="material-icons home-icons" >playlist_add_check</i> Work Orders</a>
+			<a href="${selectReport}" class="col-sm-4 btn-xl btn-inverse btn-xl"><i class="material-icons home-icons" >description</i> Reports</a>
 
 		</div>
 
 		<div class="row row-centered">
 			<div class="col-sm-2 text-center"></div>
-		<!-- 	<a href="${help}" class="col-sm-4 btn-xl btn-inverse btn-xl">Help</a> -->
-		<!-- <a href="${Placeholder}" class="col-sm-4 btn-xl btn-inverse btn-xl">Confirm Repairs</a> -->
 
 		</div>
-			<br />
+        <br />
 				
 <legend> </legend>
 	</div>
diff --git a/WebContent/WEB-INF/jsps/loginForm.jsp b/WebContent/WEB-INF/jsps/loginForm.jsp
index 7e54d1d..4dc4e65 100644
--- a/WebContent/WEB-INF/jsps/loginForm.jsp
+++ b/WebContent/WEB-INF/jsps/loginForm.jsp
@@ -10,11 +10,12 @@
 	<c:if test="${param.error != null}">
 		<div id="error">No such account exists.  Please check your username and password!</div>
 	</c:if>
+
 	<div style="margin:8%">
 		<c:url value ="/login" var="url" />
 		<form name="form" method="post" class="form-horizontal" action="${url}">
 			<fieldset>
-				<legend>Login</legend>
+				<legend><img src="https://s14.postimg.org/56v67gjap/abode.png" width="60px" style="margin-bottom:1%"><br>Login</legend>
 				
 				<div class="form-group">
 					<label for="inputUsername" class="col-lg-1 control-label">Username</label>
@@ -35,12 +36,13 @@
 				<input type="submit" value="Login!" onclick="login()" class="btn btn-inverse "
 					style="margin-left: 8.33333333333%" />
 				<c:url value="/createAccount" var="createUrl"/>
-				<a href="${createUrl}" class="btn btn-inverse ">Create an Account</a>
+<!-- 			<a href="${createUrl}" class="btn btn-inverse ">Create an Account</a> -->
 			</fieldset>
 		</form>
 		<div>
 		</br></br></br>
 		<center>
+		
 		Powered by</br>
 		<img src="https://s22.postimg.org/k1hque3wh/Jack_Software_Logo.png" alt="img/JSLogo.png" width="200px">
 		</center>
diff --git a/WebContent/WEB-INF/jsps/pdiReport.jsp b/WebContent/WEB-INF/jsps/pdiReport.jsp
index 76fa73a..1dc16b9 100644
--- a/WebContent/WEB-INF/jsps/pdiReport.jsp
+++ b/WebContent/WEB-INF/jsps/pdiReport.jsp
@@ -6,6 +6,7 @@
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
+
 <style>
 #con {
 	background-color: #EDEEFF;
@@ -24,8 +25,34 @@ label {
 	background-color: white;
 }
 
+.jumbotron {
+    padding-top: 10px;
+    padding-bottom: 85px;
+}
+
 </style>
-	
+	<body>
+			<c:choose>
+              <c:when test="${displayPage}">
+                <script>
+              
+                window.onload = function (){
+                    document.getElementById("mainReportDiv").style.display = 'visible';
+      				}
+                </script>
+                
+              </c:when>
+              <c:otherwise>
+                 <script>
+                 window.onload = function (){
+                     document.getElementById("mainReportDiv").style.display = 'none';
+                     
+       				}
+				 </script>
+               
+              </c:otherwise>
+            </c:choose>
+
 <title>Tarion PDI Form: ${unit.homeEnrollmentNumber}</title>
 
 <div id="divCon">
@@ -43,7 +70,7 @@ label {
 
 			<div class="form-group" style="margin: 2%">
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
-				<input type="submit" value="Go!" id="btnXlg" class="pull-right btn btn-primary" />
+				<input type="submit" value="Load Report" id="btnXlg" class="pull-right btn btn-primary" onclick="showPdiReport" />
 
 			</div>
 
@@ -64,11 +91,12 @@ label {
 
 
 	</div>
+	<div id="mainReportDiv">
 	
 		<c:url value="/pdiReport" var="url" />
 		<form name="form" class="form-horizontal" method="post"	action="${url}">
 			<fieldset>
-				<legend>TARION Pre-Delivery Inspection Form</legend>
+				<legend>List of Deficiencies</legend>
 				<div>
 					<table class="table table-striped table-hover">
 						<thead>
@@ -94,6 +122,8 @@ label {
 		
 	</div>
 	
+	<legend>Review of PDI</legend>
+	
 	<div class="jumbotron" id="legendCon" style="background-color:#EDEEFF">
 
 		<div class="form-group" style="margin: 2%">
@@ -177,7 +207,7 @@ label {
 					placeholder="" type="text" required="required" value="${form.repName}"  readonly/>
 			</div>
 			<div class="col-lg-6" id="sig" style="margin: 2%">
-				<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}/2" />
+				<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}" />
 			</div>
 				<div>		
 					<label for="id" class="pull-right control-label" style="margin: 2%">This section
@@ -206,7 +236,7 @@ label {
 					</div>
 			
 					<div class="col-lg-6" id="sig" id="sig" style="margin: 2%">
-						<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}" />
+						<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}/2" />
 					</div>
 				</div>
 				<div class="col-lg-12 col-md-12 col-sm-12">
@@ -247,7 +277,7 @@ label {
 			<input type="hidden" name="homeEnrollmentNumber" value="" /> 
 			<input	type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 		</div>
-		
+		</div>
 	<div class="jumbotron" id="legendCon" style="background-color:#EDEEFF; ">
 		<div style="padding:1%;" class="col-lg-12">	
 
@@ -264,4 +294,5 @@ label {
 	</div>
 	
 </div>
-</div>
\ No newline at end of file
+</div>
+</body>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp
index a5e0499..770ffc7 100644
--- a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp
@@ -5,9 +5,187 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-
+<script src="../scripts/photo.js"></script>
 <title>Add Deficiency: ${unit.homeEnrollmentNumber}</title>
 <style>
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
+@import url('https://fonts.googleapis.com/icon?family=Material+Icons');
+
+*{
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+}
+
+html{
+    background-color: #fff;
+    font:normal 16px/1.5 sans-serif;
+    color: #333;
+}
+
+h3{
+    font: normal 32px/1.5 'Open Sans', sans-serif;
+    color: #2c3e50;
+    margin: 50px 0;
+    text-align: center;
+}
+
+
+.container2{
+    max-width: 1000px;
+    margin: 50px auto;
+    padding: 20px;
+    background-color: #efefef;
+}
+
+.app2{
+    width: 100%;
+    position: relative;
+}
+
+.app2 #start-camera{
+    display: none;
+    border-radius: 3px;
+    max-width: 400px;
+    color: #fff;
+    background-color: #448AFF;
+    text-decoration: none;
+    padding: 15px;
+    opacity: 0.8;
+    margin: 50px auto;
+    text-align: center;
+}
+
+.app2 video#camera-stream{
+    display: none;
+    width: 100%;
+}
+
+.app2 img#snap{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10;
+    display: none;
+}
+
+.app2 #error-message{
+    width: 100%;
+    background-color: #ccc;
+    color: #9b9b9b;
+    font-size: 28px;
+    padding: 200px 100px;
+    text-align: center;
+    display: none;
+}
+
+.app2 .controls{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 20;
+
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    padding: 30px;
+    display: none;
+}
+
+.app2 .controls a{
+    border-radius: 50%;
+    color: #fff;
+    background-color: #111;
+    text-decoration: none;
+    padding: 15px;
+    line-height: 0;
+    opacity: 0.7;
+    outline: none;
+    -webkit-tap-highlight-color: transparent;
+}
+
+.app2 .controls a:hover{
+    opacity: 1;
+}
+
+.app2 .controls a.disabled{
+    background-color: #555;
+    opacity: 0.5;
+    cursor: default;
+    pointer-events: none;
+}
+
+.app2 .controls a.disabled:hover{
+    opacity: 0.5;
+}
+
+.app2 .controls a i{
+    font-size: 18px;
+}
+
+.app2 .controls #take-photo i{
+    font-size: 32px;
+}
+
+.app2 canvas{
+    display: none;
+}
+
+
+
+.app2 video#camera-stream.visible,
+.app2 img#snap.visible,
+.app2 #error-message.visible
+{
+    display: block;
+}
+
+.app2 .controls.visible{
+    display: flex;
+}
+
+
+
+@media(max-width: 1000px){
+    .container2{
+        margin: 40px;
+    }
+
+    .app2 #start-camera.visible{
+        display: block;
+    }
+
+    .app2 .controls a i{
+        font-size: 16px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 24px;
+    }
+}
+
+
+@media(max-width: 600px){
+    .container2{
+        margin: 10px;
+    }
+
+    .app2 #error-message{
+        padding: 80px 50px;
+        font-size: 18px;
+    }
+
+    .app2 .controls a i{
+        font-size: 12px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 18px;
+    }
+}
 #con {
 	background-color: #EDEEFF;
 	border-radius: 15px;
@@ -104,6 +282,18 @@
 							id="description" required="required"> </textarea>
 					</div>
 				</div>
+				
+				<div class="form-group">
+                	<label for="defPhoto" class="col-lg-1 control-label">Deficiency Photo</label>
+                	<div class="col-lg-8">
+                		<input path="defPhoto" name="defPhoto" class="form-control" id="defPhoto" readonly/> 
+                	</div>
+                	<div class="col-lg-2">
+					<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">
+                    Add Photo
+                  </button>
+					</div>
+                </div>
 
 				<div class="form-group">
 					<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
@@ -127,7 +317,7 @@
 					</div>
 				</div>
 
-				<input type="hidden" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
+				<input type="hidden" id="homeEnrollmentNumber" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 
 				<input type="submit" value="Save Deficiency" id="btnXlg" class="btn btn-primary" style="margin-left: 8.33333333333%" />
@@ -138,4 +328,44 @@
 			</fieldset>
 		</form>
 	</div>
-	</div>
\ No newline at end of file
+	</div>
+	<div class="modal fade" id="myModal">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <div class="container2">
+
+						  <div class="app2">
+			
+						    <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
+						    <video id="camera-stream"></video>
+						    <img id="snap">
+			
+						    <p id="error-message"></p>
+			
+						    <div class="controls">
+						      <a href="#" id="delete-photo" title="Redo Photo" class="disabled"><i class="material-icons">replay</i></a>
+						      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
+						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" 
+						      onclick="saveDone()" class="disabled">
+						      	<i class="material-icons">done</i></a>
+						    </div>
+
+
+			    <canvas></canvas>
+			  </div>
+			</div>
+			
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="saveDone()">Close</button>
+                  
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
index 1111eb1..fc992d1 100644
--- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
@@ -23,6 +23,11 @@
     font-size: 16px;
     line-height: normal;
     border-radius: 8px;
+    }
+    
+    #toggleBtnID{
+    width:120;
+    
     }
     </style>
 
@@ -40,6 +45,7 @@
 		      <th>Deficiency Type</th>
 		      <th>Notes</th>
 		      <th>Assignee</th>
+		      <th></th>
 		      <th style="text-align: center;">Status</th>
 		      <th></th>
 		      <th></th>
@@ -54,16 +60,42 @@
 				<td>${unitDeficiency.category}</td>
 				<td>${unitDeficiency.description}</td>
 				<td>${unitDeficiency.constructionPersonnel}</td>
+
 				<td>
+                    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#photoModal${unitDeficiency.id}">
+                        View Photo
+                    </button>
+                </td>
+
+                <div class="modal fade" id="photoModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <img id="defImage" src="../defImage/${unit.homeEnrollmentNumber}/${unitDeficiency.id}" />
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
+
+				<td style="text-align: center;">
 				    <c:choose>
 	              <c:when test="${unitDeficiency.status}">
 		              <c:url value="/workOrderCompleteDeficiencyUnit/${unitDeficiency.id}/${unitDeficiency.homeEnrollmentNumber}" var="completeUrl" />
-					    <a href="${completeUrl}" class="btn btn-success pull-right">Complete</a>
+					    <a href="${completeUrl}" class="btn btn-success" id="toggleBtnID">Complete</a>
 	                
 	              </c:when>
 	              <c:otherwise>
 	                <c:url value="/workOrderCompleteDeficiencyUnit/${unitDeficiency.id}/${unitDeficiency.homeEnrollmentNumber}" var="completeUrl" />
-					    <a href="${completeUrl}" class="btn btn-warning pull-right">Incompleted</a>
+					    <a href="${completeUrl}" class="btn btn-warning" id="toggleBtnID">Incomplete</a>
 	              </c:otherwise>
 	            	</c:choose>
 				</td>
@@ -71,9 +103,31 @@
 				<a href="${editUrl}" class="btn btn-primary pull-right">Edit</a>
 				</td>
 				<td>
-				    <c:url value="/workOrderDeleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
-                    <a href="${deleteUrl}" class="btn btn-danger pull-right" style="margin:1%;">Delete</a>
-				</td>
+                    <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal${unitDeficiency.id}">
+                        Delete
+                    </button>
+                </td>
+
+                <div class="modal fade" id="myModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Confirm Delete</h4>
+                      </div>
+                      <div class="modal-body">
+                        Are you sure you want to delete deficiency ${unitDeficiency.id}?
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                        <c:url value="/workOrderDeleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
+                        <a href="${deleteUrl}" class="btn btn-danger" style="margin:1%;">Delete</a>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
 				</tr>
 			</c:forEach>
 			</tbody>
diff --git a/WebContent/css/style.css b/WebContent/css/style.css
index e7a8c51..1f7520c 100644
--- a/WebContent/css/style.css
+++ b/WebContent/css/style.css
@@ -6,11 +6,17 @@
 Extra Large Button CSS
 */
 .btn-xl {
-    padding: 18px 28px;
+    padding-top: 18px 28px;
     font-size: 22px;
     border-radius: 8px;
+    
 }
 
+#toggleBtnID{
+    width:120px;
+    
+    }
+
 .no-link {
     color:inherit;
     text-decoration:none;
@@ -44,6 +50,8 @@ Extra Large Button CSS
     font-size: 16px;
     line-height: normal;
     border-radius: 8px;
+    width: 170px;
+    height: 70px;
     }
     
 #btnXlg2 {
@@ -51,4 +59,12 @@ Extra Large Button CSS
     font-size: 16px;
     line-height: normal;
     border-radius: 8px;
-    }
\ No newline at end of file
+    }
+
+img {
+    max-width:100%;
+}
+
+video {
+    max-width:100%;
+}
diff --git a/WebContent/img/abode.png b/WebContent/img/abode.png
new file mode 100644
index 0000000..06b5364
Binary files /dev/null and b/WebContent/img/abode.png differ
diff --git a/WebContent/scripts/script.js b/WebContent/scripts/script.js
index 4be8d2c..4d4c364 100644
--- a/WebContent/scripts/script.js
+++ b/WebContent/scripts/script.js
@@ -5,14 +5,13 @@ function hide(){
 used = document.getElementById("repName").value;
 //disable save on load
 $( "#saveBtn" ).prop( "disabled", true );
-
+document.getElementById("mainReportDiv").style.visibility = 'hidden';
 //test not hidden
 
 $( "#nextBtn" ).prop( "disabled", false );
 $( "#nextBtn" ).prop( "disabled", true );
 
-//document.getElementById("nextBtn").style.visibility = 'visible';
-//document.getElementById("saveBtn").style.visibility = 'visible';
+
 
 if (used === ""){
 	//alert(used);
@@ -28,6 +27,10 @@ function showSave(){
 	document.getElementById("saveBtn").style.visibility = 'visible';
 }
 
+function showPdiReport(){
+	document.getElementById("saveBtn").style.visibility = "visible";
+}
+
 function enableNextBtn(){
 	$('a').disable(false);
 }
@@ -37,10 +40,12 @@ function disableNextBtn(){
 }
 
 function acceptSig(){
+	var hen = document.getElementById("homeEnrollmentNumber").value;
+	//alert(hen);
 	var link = document.getElementById("signature").toDataURL();
-	document.getElementById("acc2").innerHTML='<a id="acc2" data-toggle="tooltip" data-placement="top" title="Attatch Signature to Form" download="refSig.png" href="'+link+'">Attach</a>';
+	document.getElementById("acc2").innerHTML='<a id="acc2" data-toggle="tooltip" data-placement="top" title="Attatch Signature to Form" download="'+hen+'refSig.png" href="'+link+'">Attach</a>';
 	showSave();
-	//alert("hi");
+	
 }
 
 function ValidateHEN() {
@@ -99,4 +104,14 @@ function verify() {
 		document.getElementById("error").innerHTML = "Please check your passwords";
 		return false;
 	}
+}
+
+function saveDone(){
+	//save =true;
+	
+	var id = document.getElementById("id").value;
+	var hen = document.getElementById("homeEnrollmentNumber").value;
+	//alert("test");
+	document.getElementById("defPhoto").value = "Deficiency"+id+".png";
+	//alert("test");
 }
\ No newline at end of file
diff --git a/WebContent/scripts/signing.js b/WebContent/scripts/signing.js
index a3f6afa..488bbf0 100644
--- a/WebContent/scripts/signing.js
+++ b/WebContent/scripts/signing.js
@@ -3,18 +3,14 @@ var sigCapture = null;
 var canvas = document.getElementById("signature");
 
 $(document).ready(function(e) {
-
 	sigCapture = new SignatureCapture( "signature" );
-
 });
 
-
 function to_image(){
     var canvas = document.getElementById("signature");
 
     document.getElementById("theimage").src = canvas.toDataURL();
     Canvas2Image.saveAsPNG(canvas);
-
 }
 
 function clearSig() {
@@ -22,56 +18,20 @@ function clearSig() {
 }
 
 function accept(){
+	alert("testing");
 	var link = document.getElementById("signature").toDataURL();
+	var hen = document.getElementById("homeEnrollmentNumber").value;
+	//alert(hen);
 	document.getElementById("acc2").innerHTML='<a id="acc2" data-toggle="tooltip" data-placement="top" title="Attatch Signature to Form" download="refSig.png" href="'+link+'">Attach</a>';
 	showSave();
-	//alert("hi");
+	
 }
 
-
-/*
-
-function download() {
-    var dt = canvas.toDataURL('image/jpeg');
-    this.href = dt;
-};
-downloadLnk.addEventListener('click', download, false);
-
-
-$(function() {
-	  $("#acc").click(function() {
-	      html2canvas(document.body, {
-	          onrendered: function(sigCapture) {
-	              return Canvas2Image.saveAsPNG(sigCapture);
-	          }
-	      });
-	  })
-	});
-
-
-//link on displayunit jsp commented out because not working
-function dlCanvas() {
-	  var dt = canvas.toDataURL();
-	  //Change MIME type to trick the browser to downlaod the file instead of displaying it 
-	  //dt = dt.replace(/^data:image\/[^;], 'data:application/octet-stream');
-
-	  //In addition to <a>'s "download" attribute, you can define HTTP-style headers 
-	  //dt = dt.replace(/^data:application\/octet-stream/, 'data:application/octet-stream;headers=Content-Disposition%3A%20attachment%3B%20filename=Canvas.png');
-
-	  this.href = dt;
-	  this.download = 'sig.png';
-	};
-	document.getElementById("dl").addEventListener('click', dlCanvas, false);
-
-
-//these 2 func together do not work
-document.getElementById('download').addEventListener('click', function() {
-    downloadCanvas(this, 'signature', 'test.png');
-}, false);
-
-function downloadCanvas(link, canvasId, filename) {
-    link.href = document.getElementById(canvasId).toDataURL();
-    link.download = filename;
+function accept2(){
+	var hen = document.getElementById("homeEnrollmentNumber").value;
+	//alert(hen);
+	var link = document.getElementById("signature").toDataURL();
+	document.getElementById("acc2").innerHTML='<a id="acc2" data-toggle="tooltip" data-placement="top" title="Attatch Signature to Form" download="'+hen+'refSig2.png" href="'+link+'">Attach</a>';
+	showSave();
+	//alert("hi");
 }
-
-*/
diff --git a/src/ca/sheridancollege/beans/ConstructionPersonnelDeficiencies.java b/src/ca/sheridancollege/beans/ConstructionPersonnelDeficiencies.java
new file mode 100644
index 0000000..3943c36
--- /dev/null
+++ b/src/ca/sheridancollege/beans/ConstructionPersonnelDeficiencies.java
@@ -0,0 +1,158 @@
+package ca.sheridancollege.beans;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Created by Perds on 11/17/2016.
+ */
+public class ConstructionPersonnelDeficiencies {
+
+    private int id;
+    private String location;
+    private String description;
+    private String constructionPersonnel;
+    private String category;
+    private Date deadline;
+    private Boolean status;
+    private long homeEnrollmentNumber;
+    private int lotNumber;
+    private String address;
+    private String projectName;
+    private Date posessionDate;
+    private int unitNum;
+    private String plan;
+
+    public ConstructionPersonnelDeficiencies() {
+    }
+
+    public ConstructionPersonnelDeficiencies(Deficiency d, Unit u) {
+        id = d.getId();
+        location = d.getLocation();
+        description = d.getDescription();
+        constructionPersonnel = d.getConstructionPersonnel();
+        category = d.getCategory();
+        deadline = d.getDeadline();
+        status = d.getStatus();
+        homeEnrollmentNumber = u.getHomeEnrollmentNumber();
+        lotNumber = u.getLotNumber();
+        address = u.getAddress();
+        projectName = u.getProjectName();
+        posessionDate = u.getPosessionDate();
+        unitNum = u.getUnitNum();
+        plan = u.getPlan();
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getConstructionPersonnel() {
+        return constructionPersonnel;
+    }
+
+    public void setConstructionPersonnel(String constructionPersonnel) {
+        this.constructionPersonnel = constructionPersonnel;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public Date getDeadline() {
+        return deadline;
+    }
+
+    public void setDeadline(Date deadline) {
+        this.deadline = deadline;
+    }
+
+    public Boolean getStatus() {
+        return status;
+    }
+
+    public void setStatus(Boolean status) {
+        this.status = status;
+    }
+
+    public long getHomeEnrollmentNumber() {
+        return homeEnrollmentNumber;
+    }
+
+    public void setHomeEnrollmentNumber(long homeEnrollmentNumber) {
+        this.homeEnrollmentNumber = homeEnrollmentNumber;
+    }
+
+    public int getLotNumber() {
+        return lotNumber;
+    }
+
+    public void setLotNumber(int lotNumber) {
+        this.lotNumber = lotNumber;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public Date getPosessionDate() {
+        return posessionDate;
+    }
+
+    public void setPosessionDate(Date posessionDate) {
+        this.posessionDate = posessionDate;
+    }
+
+    public int getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(int unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public String getPlan() {
+        return plan;
+    }
+
+    public void setPlan(String plan) {
+        this.plan = plan;
+    }
+}
diff --git a/src/ca/sheridancollege/beans/Deficiency.java b/src/ca/sheridancollege/beans/Deficiency.java
index 830e21b..84b6a73 100644
--- a/src/ca/sheridancollege/beans/Deficiency.java
+++ b/src/ca/sheridancollege/beans/Deficiency.java
@@ -19,6 +19,8 @@ public class Deficiency implements Serializable, Comparable<Deficiency> {
     private Date deadline;
     private Boolean status;
     private long homeEnrollmentNumber;
+    @Column(columnDefinition="mediumblob")
+    private byte[] defPhoto;
 
     public Deficiency() {
         this(0, null, null, null, null, false, 0);
@@ -108,4 +110,14 @@ public void setHomeEnrollmentNumber(long homeEnrollmentNumber) {
     public int compareTo(Deficiency o) {
         return id<o.getId()?-1:id>o.getId()?1:0;
     }
+
+	public byte[] getDefPhoto() {
+		return defPhoto;
+	}
+
+	public void setDefPhoto(byte[] defPhoto) {
+		this.defPhoto = defPhoto;
+	}
+    
+    
 }
diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml
index c841b82..eab0e20 100644
--- a/src/ca/sheridancollege/config/security-context.xml
+++ b/src/ca/sheridancollege/config/security-context.xml
@@ -20,6 +20,7 @@
         <security:intercept-url pattern="/pdiReportData" access="isAuthenticated()"/>
         <security:intercept-url pattern="/selectReport" access="isAuthenticated()"/>
         <security:intercept-url pattern="/imageDisplay/**" access="isAuthenticated()"/>
+        <security:intercept-url pattern="/defImage/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/addDeficiency/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/editDeficiency/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/addDeficiency2/**" access="isAuthenticated()"/>
diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java
index 7b6ea5f..6f5f355 100644
--- a/src/ca/sheridancollege/controllers/HomeController.java
+++ b/src/ca/sheridancollege/controllers/HomeController.java
@@ -299,7 +299,7 @@ public String saveUnit2(
 
         model = controllerServices.saveUnit2(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, municipality, level, unitNum, plan, repName);
 
-        return "buildInspection";
+        return "displayUnitDeficiencies2";
     }
 
     @RequestMapping("/addSignOff/{homeEnrollmentNumber}")
@@ -391,7 +391,14 @@ public void getImage(HttpServletResponse response, @PathVariable long homeEnroll
     @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}/2")
     public void getImage2(HttpServletResponse response, @PathVariable long homeEnrollmentNumber) throws IOException {
 
-        response = controllerServices.getImage(response, homeEnrollmentNumber);
+        response = controllerServices.getImage2(response, homeEnrollmentNumber);
+    }
+
+    // this displays an image from the database
+    @RequestMapping(value = "defImage/{homeEnrollmentNumber}/{id}")
+    public void getDefImage(HttpServletResponse response, @PathVariable long homeEnrollmentNumber, @PathVariable int id) throws IOException {
+
+        response = controllerServices.getDefImage(response, homeEnrollmentNumber, id);
     }
 
     @RequestMapping("/displayDeficiencies/{id}")
diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java
index 4233002..8e316c5 100644
--- a/src/ca/sheridancollege/services/ControllerServices.java
+++ b/src/ca/sheridancollege/services/ControllerServices.java
@@ -44,6 +44,20 @@ public Model saveDeficiency(Model model, int id, String location, String descrip
         constructionPersonnel = constructionPersonnel.substring(constructionPersonnel.indexOf("-")).replace("-", "").trim();
         System.out.println("construction personnel substring: " + constructionPersonnel);
         Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false, homeEnrollmentNumber);
+        
+        File sig = new File("C:\\abode\\def"+id+"hen"+homeEnrollmentNumber+".png");
+        byte[] sigImg = new byte[(int) sig.length()];
+
+        try {
+            FileInputStream input = new FileInputStream(sig);
+            input.read(sigImg);
+            input.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        deficiency.setDefPhoto(sigImg);
+        
         List<Unit> unitList = dao.getUnit(homeEnrollmentNumber);
         Unit unit = unitList.get(0);
         System.out.println("Unit Size:" + unitList.size() + homeEnrollmentNumber);
@@ -110,7 +124,7 @@ public Model displayUnitData(Model model, long homeEnrollmentNumber, long num) {
 
             //String img = form.get(0).getRepSig().toString();
             model.addAttribute("errorHomeEnrollmentNumber", false);
-
+            model.addAttribute("displayPage", true);
             return model;
         } else {
 
@@ -155,12 +169,20 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate
         }
 
         List<HomeOwner> returnPurch = dao.getHomeOwner(homeEnrollmentNumber);
-        HomeOwner ho = returnPurch.get(0);
+
+        HomeOwner ho;
+
+        if (returnPurch.size() > 0) {
+            ho = returnPurch.get(0);
+        } else {
+            ho = new HomeOwner("Jason Mamoa", "9053326718", homeEnrollmentNumber);
+        }
 
         form.setPurchName(ho.getName());
         form.setBuilderRefNum(b.getBuilderRefNum());
-
-        File sig = new File("C:\\abode\\refSig.png");
+        
+        //pic code - rep sig, 1st sig
+        File sig = new File("C:\\abode\\"+homeEnrollmentNumber+"refSig.png");
         byte[] sigImg = new byte[(int) sig.length()];
 
         try {
@@ -178,7 +200,7 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate
 
         return model;
     }
-    
+
     public Model saveUnit2(Model model, long homeEnrollmentNumber, Date posessionDate, int lotNumber, String address, String projectName, String municipality, int level, int unitNum, String plan, String repName) {
         Unit unit = new Unit(homeEnrollmentNumber, lotNumber, address, projectName, posessionDate, municipality, level, unitNum, plan);
 
@@ -203,12 +225,18 @@ public Model saveUnit2(Model model, long homeEnrollmentNumber, Date posessionDat
         }
 
         List<HomeOwner> returnPurch = dao.getHomeOwner(homeEnrollmentNumber);
-        HomeOwner ho = returnPurch.get(0);
+        HomeOwner ho;
+
+        if (returnPurch.size() > 0) {
+            ho = returnPurch.get(0);
+        } else {
+            ho = new HomeOwner("Jason Mamoa", "9053326718", homeEnrollmentNumber);
+        }
 
         form.setPurchName(ho.getName());
         form.setBuilderRefNum(b.getBuilderRefNum());
 
-        File sig = new File("C:\\abode\\refSig.png");
+        File sig = new File("C:\\abode\\"+homeEnrollmentNumber+"refSig.png");
         byte[] sigImg = new byte[(int) sig.length()];
 
         try {
@@ -233,8 +261,9 @@ public Model saveForm(Model model, long homeEnrollmentNumber, String desName) {
         Form addSignOff = returns.get(0);
 
         addSignOff.setDesName(desName);
-
-        File sig = new File("C:\\abode\\purSig.png");
+        
+        //pic for 2nd sig
+        File sig = new File("C:\\abode\\"+homeEnrollmentNumber+"refSig2.png");
         byte[] sigImg = new byte[(int) sig.length()];
 
         try {
@@ -259,7 +288,13 @@ public Model loadSignOff(Model model, long homeEnrollmentNumber) {
         Form addSignOff = returns.get(0);
 
         List<HomeOwner> home = dao.getHomeOwner(homeEnrollmentNumber);
-        HomeOwner ho = home.get(0);
+        HomeOwner ho;
+
+        if (home.size() > 0) {
+            ho = home.get(0);
+        } else {
+            ho = new HomeOwner("Jason Mamoa", "9053326718", homeEnrollmentNumber);
+        }
 
         addSignOff.setPurchName(ho.getName());
         model.addAttribute("form", addSignOff);
@@ -404,6 +439,8 @@ public HttpServletResponse getImage2(HttpServletResponse response, long homeEnro
 
         return response;
     }
+    
+    
 
     public Model completeDeficiencyUnit(Model model, int id, long homeEnrollmentNumber) {
         Unit unit = dao.completeDeficiency(id, homeEnrollmentNumber);
@@ -446,10 +483,14 @@ public Model displayPdiReport(Model model, long homeEnrollmentNumber) {
             List<Form> form = dao.getForm(homeEnrollmentNumber);
             List<Builder> builder = dao.getBuilderRefNum("batman");
 
-            model.addAttribute("form", form.get(0));
+            if (form.size() > 0) {
+                model.addAttribute("form", form.get(0));
+            } else {
+                model.addAttribute("errorForm", true);
+            }
             model.addAttribute("unit", unit.get(0));
             model.addAttribute("builder", builder.get(0));
-
+            model.addAttribute("displayPage", true);
             return model;
         } else {
 
@@ -484,7 +525,7 @@ public Model displayConstructionPersonnel(Model model) {
     }
 
     public Model displayDeficienciesByConstructionPersonnel(Model model, int id) {
-        List<Deficiency> deficiencyList = new ArrayList<>();
+        List<ConstructionPersonnelDeficiencies> deficiencyList = new ArrayList<>();
         List<Unit> unitList = dao.getAllUnits();
         List<ConstructionPersonnel> constructionPersonnelList = dao.getConstructionPersonnel(id);
         ConstructionPersonnel constructionPersonnel = constructionPersonnelList.get(0);
@@ -492,11 +533,12 @@ public Model displayDeficienciesByConstructionPersonnel(Model model, int id) {
         for (Unit unit : unitList) {
             for (Deficiency deficiency : unit.getDeficiencies()) {
                 if (deficiency.getConstructionPersonnel().equals(constructionPersonnel.getName())) {
-                    deficiencyList.add(deficiency);
+                    deficiencyList.add(new ConstructionPersonnelDeficiencies(deficiency, unit));
                 }
             }
         }
 
+        model.addAttribute("constructionPersonnel", constructionPersonnel.getName());
         model.addAttribute("deficiencyList", deficiencyList);
 
         return model;
@@ -529,4 +571,20 @@ public Model editDeficiency(Model model, long homeEnrollmentNumber, int id) {
 
         return model;
     }
+
+    public HttpServletResponse getDefImage(HttpServletResponse response, long homeEnrollmentNumber, int id) throws IOException {
+        response.setContentType("image/png");
+        List<Unit> unit = dao.getUnit(homeEnrollmentNumber);
+        List<Deficiency> deficiencyList = unit.get(0).getDeficiencies();
+        byte[] imageBytes = null;
+        for (Deficiency d : deficiencyList) {
+            if (id == d.getId()) {
+                imageBytes = d.getDefPhoto();
+            }
+        }
+        response.getOutputStream().write(imageBytes);
+        response.getOutputStream().flush();
+
+        return response;
+    }
 }
diff --git a/target/classes/ca/sheridancollege/beans/Deficiency.class b/target/classes/ca/sheridancollege/beans/Deficiency.class
index a35246a..399bf39 100644
Binary files a/target/classes/ca/sheridancollege/beans/Deficiency.class and b/target/classes/ca/sheridancollege/beans/Deficiency.class differ
diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml
index c660964..eab0e20 100644
--- a/target/classes/ca/sheridancollege/config/security-context.xml
+++ b/target/classes/ca/sheridancollege/config/security-context.xml
@@ -20,6 +20,7 @@
         <security:intercept-url pattern="/pdiReportData" access="isAuthenticated()"/>
         <security:intercept-url pattern="/selectReport" access="isAuthenticated()"/>
         <security:intercept-url pattern="/imageDisplay/**" access="isAuthenticated()"/>
+        <security:intercept-url pattern="/defImage/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/addDeficiency/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/editDeficiency/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/addDeficiency2/**" access="isAuthenticated()"/>
@@ -57,7 +58,7 @@
         <security:intercept-url pattern="/displayDeficiencies/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/css/**" access="permitAll"/>
         <security:intercept-url pattern="/scripts/**" access="permitAll"/>
-        <security:intercept-url pattern="/images/**" access="permitAll"/>
+        <security:intercept-url pattern="/img/**" access="permitAll"/>
         <security:intercept-url pattern="/" access="permitAll"/>
         <security:intercept-url pattern="/login" access="permitAll"/>
         <security:intercept-url pattern="/register" access="permitAll"/>
diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class
index 1b91249..2433353 100644
Binary files a/target/classes/ca/sheridancollege/controllers/HomeController.class and b/target/classes/ca/sheridancollege/controllers/HomeController.class differ