Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r95b456e2d455b045b20b696f2a749c0e3cc35917
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java	(.../PolicyManagementController.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java	(.../PolicyManagementController.java)	(revision 95b456e2d455b045b20b696f2a749c0e3cc35917)
@@ -92,7 +92,7 @@
 
 	String currentDate = ZonedDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE);
 
-	Object policyUid = policyForm.getPolicyId();
+	Object policyUid = policyForm.getPolicyUid();
 	String version = policyForm.getVersion();
 	Integer policyStateId = policyForm.getPolicyStateId();
 	Boolean isMinorChange = policyForm.getMinorChange();
Index: lams_admin/web/policies/editPolicy.jsp
===================================================================
diff -u -r37c404bc2d0032716112057bebc1314cbc30d102 -r95b456e2d455b045b20b696f2a749c0e3cc35917
--- lams_admin/web/policies/editPolicy.jsp	(.../editPolicy.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
+++ lams_admin/web/policies/editPolicy.jsp	(.../editPolicy.jsp)	(revision 95b456e2d455b045b20b696f2a749c0e3cc35917)
@@ -4,14 +4,13 @@
 <lams:html>
 <lams:head>
 	<c:set var="title"><fmt:message key="admin.policies.title"/></c:set>
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	<title>${title}</title>
 
 	<lams:css/>
 	<link rel="stylesheet" href="<lams:LAMSURL/>/admin/css/admin.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-smoothness-theme.css" type="text/css" media="screen">
-	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	
-	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/changeStyle.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
@@ -29,7 +28,6 @@
 	                		//skip out empty values
 	                		//CKEDITOR.instances.summary.value = ((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) ? "" : ckeditorData;
 	
-	                    	
 	                    	CKEDITOR.instances.summary.updateElement();
 	                    	//alert("s"+ckeditorData);
 	                    	//return false;
@@ -55,7 +53,7 @@
 			            error.appendTo('#full-policy-error');
 			        } else {
 			            error.insertAfter(element);
-			          }
+			        }
 			    }
 			});
 		});
@@ -69,7 +67,7 @@
 			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
 				<fmt:message key="sysadmin.maintain" />
 			</a>
-			<a href="policyManagement/list.do" class="btn btn-default loffset5">
+			<a href="../policyManagement/list.do" class="btn btn-default loffset5">
 				<fmt:message key="admin.policies.title" />
 			</a>
 		</div>
@@ -80,7 +78,7 @@
 			<table class="table table-condensed table-no-border">
 				<tr>
 					<td><fmt:message key="label.name" />&nbsp;&nbsp;*</td>
-					<td><form:text path="policyName" size="40" maxlength="255" cssClass="form-control"/></td>
+					<td><form:input path="policyName" size="40" maxlength="255" cssClass="form-control" /></td>
 				</tr>
 				<tr>
 					<td style="width: 250px;"><fmt:message key="label.policy.type" />:</td>
@@ -95,7 +93,7 @@
 				</tr>
 				<tr>
 					<td><fmt:message key="label.version" /></td>
-					<td><form:text path="version" size="40" maxlength="255" cssClass="form-control"/></td>
+					<td><form:input path="version" size="40" maxlength="255" cssClass="form-control"/></td>
 				</tr>
 				<tr>
 					<td><fmt:message key="label.summary" />&nbsp;&nbsp;*</td>
@@ -121,13 +119,15 @@
 					<td><fmt:message key="label.policy.status" /></td>
 					<td>
 		                <div class="radio">
-		                    <label><form:radio path="policyStateId" value="1" />
-		                            <fmt:message key="label.policy.status.active" />
+		                    <label>
+		                    	<form:radiobutton path="policyStateId" value="1" />
+		                        <fmt:message key="label.policy.status.active" />
 		                    </label>
 		                </div>
 		                <div class="radio">
-		                    <label><form:radio path="policyStateId" value="2" />
-		                            <fmt:message key="label.policy.status.inactive" />
+		                    <label>
+		                    	<form:radiobutton path="policyStateId" value="2" />
+		                        <fmt:message key="label.policy.status.inactive" />
 		                    </label>
 		                    <span id="helpBlock" class="help-block"><fmt:message key="label.policy.status.hint" /></span>
 		                </div>
Index: lams_admin/web/policies/policies.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r95b456e2d455b045b20b696f2a749c0e3cc35917
--- lams_admin/web/policies/policies.jsp	(.../policies.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_admin/web/policies/policies.jsp	(.../policies.jsp)	(revision 95b456e2d455b045b20b696f2a749c0e3cc35917)
@@ -54,7 +54,7 @@
 				var policyId = $(this).data("policy-id");
 				
 				$("#policy-table").load(
-					"policyManagement/togglePolicyStatus.do", 
+					"togglePolicyStatus.do", 
 					{
 						policyUid: policyUid,
 						policyId: policyId,
Index: lams_admin/web/policies/policyTable.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r95b456e2d455b045b20b696f2a749c0e3cc35917
--- lams_admin/web/policies/policyTable.jsp	(.../policyTable.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_admin/web/policies/policyTable.jsp	(.../policyTable.jsp)	(revision 95b456e2d455b045b20b696f2a749c0e3cc35917)
@@ -66,7 +66,7 @@
 						
 			<td>
 				<c:if test="${!viewPreviousVersions && policy.hasPreviousVersions()}">
-					<a href="<lams:WebAppURL />policyManagement/viewPreviousVersion.do?policyId=${policy.Id}">
+					<a href="<lams:WebAppURL />policyManagement/viewPreviousVersions.do?policyId=${policy.policyId}">
 						<fmt:message key="label.view.previous.versions"/>
 					</a>
 				</c:if>	
Index: lams_admin/web/policies/userConsents.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r95b456e2d455b045b20b696f2a749c0e3cc35917
--- lams_admin/web/policies/userConsents.jsp	(.../userConsents.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_admin/web/policies/userConsents.jsp	(.../userConsents.jsp)	(revision 95b456e2d455b045b20b696f2a749c0e3cc35917)
@@ -27,7 +27,7 @@
 				autoencode:false,
 				caption: "${organisationName}",
 			    datatype: "json",
-			    url: "<lams:LAMSURL />/admin/policyManagement/getConsentsGridDatado?policyUid=${policy.uid}",
+			    url: "<lams:LAMSURL />/admin/policyManagement/getConsentsGridData.do?policyUid=${policy.uid}",
 				height: 'auto',
 				width: $(window).width() - 100,
 				shrinkToFit: false,
Index: lams_central/web/policyConsents.jsp
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r95b456e2d455b045b20b696f2a749c0e3cc35917
--- lams_central/web/policyConsents.jsp	(.../policyConsents.jsp)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_central/web/policyConsents.jsp	(.../policyConsents.jsp)	(revision 95b456e2d455b045b20b696f2a749c0e3cc35917)
@@ -1,11 +1,9 @@
 <!DOCTYPE html>
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
 
 <lams:html>
 <lams:head>
@@ -123,9 +121,9 @@
 	</table>
 	
 		<div style="overflow:auto;">
-			<html:submit styleClass="btn btn-primary pull-right">
+			<button type="submit" class="btn btn-primary pull-right">
 				<fmt:message key="label.consent"/>
-			</html:submit>
+			</button>
 		</div>
 	</form>
 	
Index: lams_central/web/profile/policyDetails.jsp
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r95b456e2d455b045b20b696f2a749c0e3cc35917
--- lams_central/web/profile/policyDetails.jsp	(.../policyDetails.jsp)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_central/web/profile/policyDetails.jsp	(.../policyDetails.jsp)	(revision 95b456e2d455b045b20b696f2a749c0e3cc35917)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
-
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
Index: lams_central/web/profile/profilePolicyConsents.jsp
===================================================================
diff -u -r604aefbe331242a46a8dc24d8d849f119577351d -r95b456e2d455b045b20b696f2a749c0e3cc35917
--- lams_central/web/profile/profilePolicyConsents.jsp	(.../profilePolicyConsents.jsp)	(revision 604aefbe331242a46a8dc24d8d849f119577351d)
+++ lams_central/web/profile/profilePolicyConsents.jsp	(.../profilePolicyConsents.jsp)	(revision 95b456e2d455b045b20b696f2a749c0e3cc35917)
@@ -48,7 +48,7 @@
 						<c:forEach items="${policyDtos}" var="policyDto">
 							<tr>
 								<td>
-									<a href="profile/displayPolicyDetails.do?policyUid=${policyDto.uid}" target="_new"
+									<a href="displayPolicyDetails.do?policyUid=${policyDto.uid}" target="_new"
 											title="<fmt:message key="label.policy.details"/>">
 										<c:out value="${policyDto.policyName}" />
 									</a>