diff --git a/WebContent/WEB-INF/jsps/pdiReport.jsp b/WebContent/WEB-INF/jsps/pdiReport.jsp
index 5ed4339..1f3182f 100644
--- a/WebContent/WEB-INF/jsps/pdiReport.jsp
+++ b/WebContent/WEB-INF/jsps/pdiReport.jsp
@@ -28,41 +28,56 @@
 	src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
 	integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
 	crossorigin="anonymous"></script>
+	
+<style>
+#con {
+	background-color: #EDEEFF;
+}
+
+table{
+	border: #D1D0CE solid 1px;
+}
+#divCon {
+   
+}
+label {
+    text-align: left;
+}
+#sig{
+	background-color: white;
+}
+</style>
+	
 <title>Tarion PDI Form: ${unit.homeEnrollmentNumber}</title>
 </head>
 <body>
+
+<div id="divCon">
+
 <div style="margin: 2%">
-	<div class="jumbotron">
-	
+	<div class="jumbotron" id="con">
 	<c:url value="/pdiReportData" var="url2" />
-	
 	<form method="post" action="${url2}" class="form-horizontal">
 			
-			<div class="form-group">
-
-				<label class="col-lg-8 control-label">Enter Home Enrollment Number</label>
-
-				<input name="homeEnrollmentNumber" placeholder="Enter Home Enrollment Number" class="form-control col-lg-8 " required="required"/>
+			<div class="form-group" style="margin: 2%">
+				<label class="pull-left control-label">Enter Home Enrollment Number</label>
+				<input name="homeEnrollmentNumber" placeholder="Enter Home Enrollment Number" class="form-control" required="required"/>
 			</div>
 
-			<div class="form-group">
+			<div class="form-group" style="margin: 2%">
 				 <input	type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 				<input type="submit" value="Go!" class="pull-right btn btn-default" />
 
 			</div>
 </form>
-	
 	</div>
 	
-	
 		<c:url value="/pdiReport" var="url" />
-		<form name="form" class="form-horizontal" method="post"
-			action="${url}">
-
+		<form name="form" class="form-horizontal" method="post"	action="${url}">
 			<fieldset>
 				<legend>TARION Pre-Delivery Inspection Form</legend>
 				<div>
-					<table class="table table-inverse table-hover ">
+					<table class="table table-striped table-hover">
 						<thead>
 							<tr>
 								<th>#</th>
@@ -71,193 +86,208 @@
 								<th>Description:</th>
 							</tr>
 						</thead>
-						
-					</table>
-					<c:forEach var="deficiency" items="${unit.deficiencies}">
-				<div class="list-group-item"> ${deficiency.id} + ${deficiency.location} + ${deficiency.description} 
-				    				    
-				</div>
+						 <tbody>
+			<c:forEach var="unitDeficiency" items="${unit.deficiencies}">
+				<tr>
+				<td>${unitDeficiency.id}</td>
+				<td>${unitDeficiency.location}</td>
+				<td>${unitDeficiency.category}</td> 
+				<td>${unitDeficiency.description}</td>
+
+				</tr>
 			</c:forEach>
+			</tbody>
+					</table>
+						
 
-				<div></div>
+				
 	</div>
-	<div class="jumbotron other-colour">
-
-		<div class="form-group">
-			
-			<label for="dateOfPosession" class="col-lg-1 control-label">Date
-				of Posession</label>
-
-			<div class="col-lg-2">
-				<input path="dateOfPosession" name="posessionDate"
-					class="form-control" id="dateOfPosession"
-					value="${unit.posessionDate}" required="required" type="text" />
+	
+	<div class="jumbotron" id="con" >
+
+		<div class="form-group" style="margin: 2%">
+		
+			<div class="col-lg-12">
+				<label for="dateOfPosession" class="pull-left control-label">Date of Posession</label>			
+				<input path="dateOfPosession" name="posessionDate" class="form-control col-lg-10"
+				 id="dateOfPosession" value="${unit.posessionDate}" required="required"
+				  type="text" />
 			</div>
 
-			<label for="venBuildRefNo" class="col-lg-7 control-label">Vendor/Builder
-				and Reference Number</label>
-
-			<div class="col-lg-2">
-				<input path="venBuildRefNo" name="builderRefNum"
-					class="form-control" id="venBuildRefNo" placeholder=""
-					required="required" type="text" value="${builder.builderRefNum}" />
-
+			<div class="col-lg-12">
+				<label for="venBuildRefNo" class="pull-left control-label">Vendor/Builder and Reference Number</label>
+				<input path="venBuildRefNo" name="builderRefNum" class="form-control" 
+				id="venBuildRefNo" placeholder="" required="required" type="text" 
+				value="${builder.builderRefNum}" />
 			</div>
 
-			<label for="lotNum" class="col-lg-1 control-label">Lot # </label>
-
-			<div class="col-lg-1">
+			<div class="col-lg-12">
+				<label for="lotNum" class="pull-left control-label">Lot # </label>
 				<input path="unit.lotNumber" name="lotNumber" class="form-control"
-					id="lotNumber" value="${unit.lotNumber}" required="required"
-					type="text" />
-
+				id="lotNumber" value="${unit.lotNumber}" required="required" type="text" />
 			</div>
 
-
-			<label for="plan" class="col-lg-1 control-label">Plan</label>
-
-			<div class="col-lg-4">
+			<div class="col-lg-12">
+				<label for="plan" class="pull-left control-label">Plan</label>
 				<input path="plan" name="plan" class="form-control" id="plan"
-					placeholder="" required="required" type="text" value="${unit.plan}" />
+				placeholder="" required="required" type="text" value="${unit.plan}" />
 			</div>
 
-			<label for="municipality" class="col-lg-3 control-label">Municipality</label>
-
-			<div class="col-lg-2">
+			<div class="col-lg-12">
+				<label for="municipality" class="pull-left control-label">Municipality</label>
 				<input path="municipality" name="municipality" class="form-control"
-					id="municipality" value="${unit.municipality}" required="required"
-					type="text" />
-
+				id="municipality" value="${unit.municipality}" required="required" type="text" />
 			</div>
-			<label for="condoProjName" class="col-lg-3 control-label">Condominium
-				Project Name</label>
-
-			<div class="col-lg-4">
+			
+			<div class="col-lg-12">
+				<label for="condoProjName" class="pull-left control-label">Condominium Project Name</label>
 				<input path="condoProjName" name="projectName" class="form-control"
-					id="condoProjName" value="${unit.projectName}" required="required"
-					type="text" />
+				id="condoProjName" value="${unit.projectName}" required="required"
+				type="text" />
 			</div>
 
-			<label for="level" class="col-lg-3 control-label">Level</label>
-
-			<div class="col-lg-2">
+			<div class="col-lg-12">
+				<label for="level" class="pull-left control-label">Level</label>
 				<input path="level" name="level" class="form-control" id="level"
-					placeholder="" required="required" type="text"
-					value="${unit.level}" />
+				placeholder="" required="required" type="text"
+				value="${unit.level}" />
 			</div>
-			<label for="level" class="col-lg-3 control-label">Unit</label>
+			
 
-			<div class="col-lg-2">
+			<div class="col-lg-12">
+				<label for="level" class="pull-left control-label">Unit</label>
 				<input path="level" name="level" class="form-control" id="level"
-					placeholder="" required="required" type="text"
-					value="${unit.unitNum}" />
+				placeholder="" required="required" type="text"
+				value="${unit.unitNum}" />
 			</div>
-			<label for="homeCivicAddress" class="col-lg-3 control-label">Home
-				Civic Address</label>
 
-			<div class="col-lg-4">
+
+			<div class="col-lg-12">
+				<label for="homeCivicAddress" class="pull-left control-label">Home Civic Address</label>
 				<input path="homeCivicAddress" name="address" class="form-control"
-					id="homeCivicAddress" placeholder="" required="required"
-					type="text" value="${unit.address}" />
+				id="homeCivicAddress" placeholder="" required="required"
+				type="text" value="${unit.address}" />
 			</div>
-			<label for="venBuildName" class="col-lg-3 control-label">Vendor
-				/ Builder Name</label>
 
-			<div class="col-lg-9">
+
+			<div class="col-lg-12">
+				<label for="venBuildName" class="pull-left control-label">Vendor	/ Builder Name</label>
 				<input path="venBuildName" name="builderName" class="form-control"
-					id="venBuildName" placeholder="" required="required" type="text"
-					value="${builder.builderName}" />
+				id="venBuildName" placeholder="" required="required" type="text"
+				value="${builder.builderName}" />
 			</div>
-			<label for="repName" class="col-lg-3 control-label">Representative
-				Name</label>
 
-			<div class="col-lg-4">
-				<input path="repName" name="repName" class="form-control"
-					id="repName" placeholder="" type="text" required="required"
-					value="${form.repName}" />
+			
+			<div class="col-lg-12">
+				<label for="repName" class="pull-left control-label">Representative Name</label>
+				</div>
+					<div class="col-lg-6">
+						<input path="repName" name="repName" class="form-control" id="repName" 
+						placeholder="" type="text" required="required" value="${form.repName}"  />
+					</div>
+				<div class="col-lg-6" id="sig">
+					<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}/2" />
 			</div>
+						
+				<label for="id" class="pull-left control-label" style="margin: 1%">This section
+				should be completed and signed by all persons who are shown as
+				purchasers on the APS for the home, or as owners of land in a
+				construction contract(and / or by their designate*).</label>
+			
 		</div>
 
 	</div>
-	<label for="id" class="col-lg-1 control-label">This section
-		should be completed and signed by all persons who are shown as
-		purchasers on the APS for the home, or as owners of land in a
-		construction contract(and / or by their designate*).</label>
-	<div class="jumbotron other-colour">
+	
 
-		<div class="form-group">
-			<label for="id" class="col-lg-1 control-label">I have
+			
+	<div class="jumbotron" id="con">
+	
+			
+	
+		<div style="margin: 2%">
+		<div class="form-group" style="margin: 2%">
+		<label for="id" class="" control-label" style="margin: 1%">I have
 				inspected my new home and I agree that the descriptions of the items
 				listed on this form are accurate</label>
-
-		</div>
-
-		<div class="form-group">
-			<div class="col-lg-6">
-				<input path="id" name="id" class="form-control" id="id" value="${form.purchName}"
-					readonly />
+		
+			<div class="col-sm-6">
+				<input path="id" name="id" class="form-control" id="id" value="${form.purchName}"  />
 			</div>
-			<div class="col-lg-6">
+			
+			<div class="col-lg-6" id="sig">
 				<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}" />
 			</div>
-			<label for="deadline" class="col-lg-1 control-label">Purchaser's
-				Name</label> <label for="deadline" class="col-lg-1 control-label">Purchaser's
-				Signature</label>
-
-			<div class="col-lg-6">
-				<input path="id" name="id" class="form-control" id="id" value=""
-					readonly />
+			
+			<div>
+				<label for="deadline" class="pull-left control-label">Purchaser's Name</label>
+				
 			</div>
-			<div class="col-lg-6">
-				<input path="deadline" name="deadline" class="form-control"
-					id="deadline" value="" readonly />
+			<div>
+				<label for="deadline" class="pull-right control-label">Purchaser's Signature</label>
+			</div>
+			
+			<!-- <div >
+				<input path="id" name="id" class="form-control col-lg-12" id="id" value="" />
+				<input path="deadline" name="deadline" class="form-control"	id="deadline" value=""  />
+			</div>
+			
+			 <div>
+				<label for="deadline" class="pull-left control-label">Purchaser's Name</label> 
+				<label for="deadline" class="pull-right control-label">Purchaser's Signature</label>
 			</div>
-			<label for="deadline" class="col-lg-1 control-label">Purchaser's
-				Name</label> <label for="deadline" class="col-lg-1 control-label">Purchaser's
-				Signature</label>
-				
 				
 
-			<div class="col-lg-6">
-				<input path="id" name="id" class="form-control" id="id" value=""
-					readonly />
-			</div>
-			<div class="col-lg-6">
-				<input path="deadline" name="deadline" class="form-control"
-					id="deadline" value="" readonly />
+			<div >
+				<input path="id" name="id" class="form-control" id="id" value=""  />			
+				<input path="deadline" name="deadline" class="form-control"	id="deadline" value=""  />
 			</div>
-			<label for="deadline" class="col-lg-1 control-label">Purchaser's
-				Name</label> <label for="deadline" class="col-lg-1 control-label">Purchaser's
-				Signature</label>
-			<div class="col-lg-6">
-				<input path="id" name="id" class="form-control" id="id" value="${form.date}"
-					readonly /> <label for="deadline" class="col-lg-1 control-label">Date
-					(YYYY/MM/DD)</label>
+			
+			<div>
+				<label for="deadline" class="pull-left control-label pull-left">Purchaser's Name</label>
+				<label for="deadline" class="pull-right control-label">Purchaser's Signature</label>
+			</div> -->
+				
+			<div >
+				<input path="id" name="id" class="form-control col-lg-12 " id="id" value="${form.date}"  /> 
+				<label for="deadline" class="pull-left control-label ">Date (YYYY/MM/DD)</label>
 			</div>
-			<label for="deadline" class="col-lg-1 control-label">*Purchasers
-				or owners who indend to designate someone to conduct the PDI in
-				their place should ensure they provide written authority to the
-				vendor/builder authorizng the designate to sign this form on their
-				behalf</label>
+			
+			
 		</div>
-
-		</fieldset>
-		</form>
-
+	
 	</div>
-	<div class="jumbotron">
-
-		<input type="hidden" name="homeEnrollmentNumber" value="" /> <input
-			type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
-
-		<input type="submit" value="Finish" class="btn btn-primary"
-			style="margin-left: 8.33333333333%" />
+	</div>
+		<div style="margin: 2%">
+			<label for="deadline" class="col-lg-12 control-label pull-left">*Purchasers
+			or owners who indend to designate someone to conduct the PDI in
+			their place should ensure they provide written authority to the
+			vendor/builder authorizng the designate to sign this form on their
+			behalf
+		</label>
+	
+	</div>
+			</fieldset>
+	</form>
 
+		
+	
+	<div class="jumbotron" id="con" >
+		<div style="margin: 2%">
+			<input type="hidden" name="homeEnrollmentNumber" value="" /> 
+			<input	type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 
-		<c:url value="/selectReport"
-			var="selectReport" />
-		<a href="${selectReport}" class="pull-right btn btn-default">Back</a>
+			<!-- <input type="submit" value="Finish" class="btn btn-primary"
+				style="margin-left: 8.33333333333%" /> -->
 
+			<c:url value="/selectReport" var="selectReport" />
+			<a href="${selectReport}" class="pull-right btn btn-default">Back</a>
+			
+			<c:url value="/" var="home" />
+			<a href="${home}" class="pull-left btn btn-default">Done</a>
+		</div>	
 	</div>
+	
+</div>
+</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/selectReport.jsp b/WebContent/WEB-INF/jsps/selectReport.jsp
index a6f0892..3ed6d41 100644
--- a/WebContent/WEB-INF/jsps/selectReport.jsp
+++ b/WebContent/WEB-INF/jsps/selectReport.jsp
@@ -28,17 +28,15 @@
 	src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
 	integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
 	crossorigin="anonymous"></script>
-	
-	<style>
-
-#smallJum{
-	background-color:#EDEEFF;
-	padding: 2%;
-	border-radius: 15px;
+<style>
+#con {
+	background-color: #EDEEFF;
 }
 
+table{
+	border: #D1D0CE solid 1px;
+}
 </style>
-
 <title>Tarion Report Selection</title>
 </head>
 <body>
@@ -52,7 +50,7 @@
 				<legend>Report Selection</legend>
 	</div>
 
-	<div id="smallJum" class="jumbotron">
+	<div class="jumbotron" id="con">
 
 		<div class="form-group">
 		
