Index: lams_admin/web/policies/editPolicy.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_admin/web/policies/editPolicy.jsp	(.../editPolicy.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_admin/web/policies/editPolicy.jsp	(.../editPolicy.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -152,7 +152,7 @@
 				<a href="<lams:LAMSURL/>admin/policyManagement/list.do" class="btn btn-default">
 					<fmt:message key="admin.cancel" />
 				</a>
-				<input type="submit" id="submitButton" class="btn btn-primary loffset5"><fmt:message key="admin.submit" /></input>
+				<button type="submit" id="submitButton" class="btn btn-primary loffset5"><fmt:message key="admin.submit" /></button>
 			</div>
 		
 		</form:form>
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -199,7 +199,8 @@
 						</div>	
 						<div class="checkbox">
 							<label>
-								<input id="startMonitorField" name="startMonitor" value="true" type="checkbox"><fmt:message key="label.tab.advanced.field.monitor" /></input><br />
+								<input id="startMonitorField" name="startMonitor" value="true" type="checkbox">
+								<fmt:message key="label.tab.advanced.field.monitor" />
 							</label>
 						</div>
 						<div class="checkbox">
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -652,15 +652,15 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.default" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldDefault" type="checkbox"></input>
+					<input class="propertiesContentFieldDefault" type="checkbox">
 				</td>
 			</tr>
 		</table>
@@ -673,7 +673,7 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
@@ -703,7 +703,7 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
@@ -724,8 +724,8 @@
 				</td>
 				<td>
 					 <input class="propertiesContentFieldGroupCountEnable" type="radio"
-					 		name="propertiesContentFieldGroupDivide"></input>
-					 <input class="propertiesContentFieldGroupCount spinner" type="text"></input>
+					 		name="propertiesContentFieldGroupDivide">
+					 <input class="propertiesContentFieldGroupCount spinner" type="text">
 				</td>
 			</tr>
 			<tr>
@@ -734,24 +734,24 @@
 				</td>
 				<td>
 					<input class="propertiesContentFieldLearnerCountEnable" type="radio"
-					 		name="propertiesContentFieldGroupDivide"></input>
-					 <input class="propertiesContentFieldLearnerCount spinner" type="text"></input>
+					 		name="propertiesContentFieldGroupDivide">
+					 <input class="propertiesContentFieldLearnerCount spinner" type="text">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.groups.equal" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldEqualSizes" type="checkbox"></input>
+					 <input class="propertiesContentFieldEqualSizes" type="checkbox">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.groups.view.learners" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldViewLearners" type="checkbox"></input>
+					 <input class="propertiesContentFieldViewLearners" type="checkbox">
 				</td>
 			</tr>
 			<tr>
@@ -770,7 +770,7 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td colspan="3">
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
@@ -807,21 +807,24 @@
 					<fmt:message key="authoring.fla.page.prop.gate.delay" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetDay spinner" type="text"></input> <fmt:message key="authoring.fla.page.prop.days" />
+					<input class="propertiesContentFieldOffsetDay spinner" type="text"> 
+					<fmt:message key="authoring.fla.page.prop.days" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetHour spinner" type="text"></input> <fmt:message key="authoring.fla.page.prop.hours" />
+					<input class="propertiesContentFieldOffsetHour spinner" type="text"> 
+					<fmt:message key="authoring.fla.page.prop.hours" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetMinute spinner" type="text"></input> <fmt:message key="authoring.fla.page.prop.minutes" />
+					<input class="propertiesContentFieldOffsetMinute spinner" type="text"> 
+					<fmt:message key="authoring.fla.page.prop.minutes" />
 				</td>
 			</tr>
 			<tr class="propertiesContentRowGateSchedule">
 				<td colspan="3">
 					<fmt:message key="authoring.fla.page.prop.gate.activity.finish.based" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldActivityCompletionBased" type="checkbox"></input>
+					 <input class="propertiesContentFieldActivityCompletionBased" type="checkbox">
 				</td>
 			</tr>
 			<tr class="propertiesContentRowConditions">
@@ -845,7 +848,7 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
@@ -897,15 +900,15 @@
 					<fmt:message key="authoring.fla.page.prop.branching.sequences.min" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalSequenceMin spinner" type="text"></input>
+					<input class="propertiesContentFieldOptionalSequenceMin spinner" type="text">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.branching.sequences.max" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalSequenceMax spinner" type="text"></input>
+					<input class="propertiesContentFieldOptionalSequenceMax spinner" type="text">
 				</td>
 			</tr>
 		</table>
@@ -919,7 +922,7 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
@@ -941,23 +944,23 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text" maxlength="50"></input>
+					 <input class="propertiesContentFieldTitle" type="text" maxlength="50">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.optional.activities.min" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalActivityMin spinner" type="text"></input>
+					<input class="propertiesContentFieldOptionalActivityMin spinner" type="text">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.optional.activities.max" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalActivityMax spinner" type="text"></input>
+					<input class="propertiesContentFieldOptionalActivityMax spinner" type="text">
 				</td>
 			</tr>
 		</table>
@@ -971,15 +974,15 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text"></input>
+					 <input class="propertiesContentFieldTitle" type="text">
 				</td>
 			</tr>
 			<tr height="50px" valign="top">
 				<td>
 					<fmt:message key="authoring.fla.page.prop.color" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldColor" type="text"></input>
+					 <input class="propertiesContentFieldColor" type="text">
 				</td>
 			</tr>
 		</table>
@@ -993,15 +996,15 @@
 					<fmt:message key="authoring.fla.page.prop.title" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldTitle" type="text"></input>
+					 <input class="propertiesContentFieldTitle" type="text">
 				</td>
 			</tr>
 			<tr height="50px" valign="top">
 				<td>
 					<fmt:message key="authoring.fla.page.prop.color" />
 				</td>
 				<td>
-					 <input class="propertiesContentFieldColor" type="text"></input>
+					 <input class="propertiesContentFieldColor" type="text">
 				</td>
 			</tr>
 			<tr >
Index: lams_central/web/authoring/template/grouping.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_central/web/authoring/template/grouping.jsp	(.../grouping.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/authoring/template/grouping.jsp	(.../grouping.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -6,19 +6,19 @@
 	</div></div>
 	<div class="panel-body">	
 
-		
-
 		<select name="grouping" id="grouping" title="<fmt:message key="authoring.label.grouping" />" class="form-control form-control-sm form-control-inline">
 			<option value="1"><fmt:message key="authoring.label.grouping.random.allocation" /></option>
 			<option value="2" selected><fmt:message key="authoring.label.grouping.teachers.choice" /></option>
 			<option value="4"><fmt:message key="authoring.label.grouping.learners.choice" /></option>
 		</select>
 		&nbsp;
-		<input type="radio" name="groupControl" value="numGroups" id="groupControlGroups" checked> <fmt:message key="authoring.label.numgroups"/></input> 
-		<input name="numGroups" id="numGroups" type="number" min="1" step="1" value="4" size="3"  class="inputclass form-control input-sm form-control-inline"/>
+		<input type="radio" name="groupControl" value="numGroups" id="groupControlGroups" checked> 
+		<label for="groupControlGroups"><fmt:message key="authoring.label.numgroups"/></label> 
+		<input name="numGroups" id="numGroups" type="number" min="1" step="1" value="4" size="3"  class="inputclass form-control input-sm form-control-inline">
 		&nbsp;
-		<input type="radio" name="groupControl" value="numLearners" id="groupControlLearners" class="voffset5"><span id="numLearnersSpan"> <fmt:message key="authoring.label.numlearners"/></span></input> 
-		<input name="numLearners" id="numLearners" type="number" step="1" min="1" value="1" size="3"  class="inputclass form-control input-sm form-control-inline voffset5" disabled/>
+		<input type="radio" name="groupControl" value="numLearners" id="groupControlLearners" class="voffset5">
+		<label for="groupControlLearners"><span id="numLearnersSpan"> <fmt:message key="authoring.label.numlearners"/></span></label>  
+		<input name="numLearners" id="numLearners" type="number" step="1" min="1" value="1" size="3"  class="inputclass form-control input-sm form-control-inline voffset5" disabled>
 
 	</div>
 	</div>
Index: lams_central/web/extGroups.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_central/web/extGroups.jsp	(.../extGroups.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/extGroups.jsp	(.../extGroups.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -29,9 +29,8 @@
 
 	<c:forEach var="group" items="${extGroups}">
 		<div class="groupingContainer">
-			<input name="extGroupIds" value="${group.groupId}" type="checkbox">
-				<c:out value="${group.groupName}" />
-			</input>
+			<input name="extGroupIds" id="extGroupIds" value="${group.groupId}" type="checkbox">
+			<label for="extGroupIds"><c:out value="${group.groupName}" /></label>
 			
 			<span class="groupCount" title='<fmt:message key="label.course.groups.grouping.count.label" />'>
 				(<fmt:message key='authoring.fla.page.prop.groups.learners' /> ${group.numberUsers})
Index: lams_tool_assessment/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rf60ded2a09e60f1f154f71b40f40caa2908c77c5 -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision f60ded2a09e60f1f154f71b40f40caa2908c77c5)
+++ lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -52,7 +52,7 @@
 		<lams:Page title="${title}" type="navbar">
 		
 			<form:hidden path="assessment.contentId" />
-			<input type="hidden" name="mode" value="${mode}"/>
+			<input type="hidden" name="mode" value="${mode}">
 			<form:hidden path="sessionMapID" />
 			<form:hidden path="contentFolderID" />
 			<form:hidden path="currentTab" id="currentTab" />
Index: lams_tool_chat/web/pages/authoring/basic.jsp
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_chat/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -6,7 +6,7 @@
 <!-- ========== Basic Tab ========== -->
 <div class="form-group">
     <label for="title"><fmt:message key="label.authoring.basic.title"/></label>
-    <input type="text" name="title" value="${authoringForm.title}" class="form-control"></input>
+    <input type="text" name="title" value="${authoringForm.title}" class="form-control">
 </div>
 <div class="form-group">
     <label for="instructions"><fmt:message key="label.authoring.basic.instructions" /></label>
Index: lams_tool_daco/web/pages/learning/listRecords.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -180,16 +180,16 @@
 											<c:out value="${question.description}" escapeXml="false"/>
 											<c:choose>
 												<c:when test="${question.type==1}">
-													<input type="text" size="60" readonly="readonly" value="<c:out  value='${answer.answer}'/>"/>
+													<input type="text" size="60" readonly="readonly" value="<c:out  value='${answer.answer}'/>">
 												</c:when>
 												<c:when test="${question.type==2}">
 													<textarea  cols="60" rows="3" readonly="readonly">${answer.answer}</textarea>
 												</c:when>
 												<c:when test="${question.type==3}">
-													<input type="text" size="10" readonly="readonly" value="<c:out  value='${answer.answer}'/>"/>
+													<input type="text" size="10" readonly="readonly" value="<c:out  value='${answer.answer}'/>">
 												</c:when>
 												<c:when test="${question.type==4}">
-													<input type="text" size="20" readonly="readonly" value="<c:out  value='${answer.answer}'/>" />
+													<input type="text" size="20" readonly="readonly" value="<c:out  value='${answer.answer}'/>">
 												</c:when>
 												<c:when test="${question.type==5 || question.type==6}">
 													<c:choose>
@@ -205,11 +205,11 @@
 												<c:when test="${question.type==7}">
 													<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 														<input type="radio" readonly="readonly" 
-														<c:if test="${answer.answer==status.index+1}">
-														checked="checked"
-														</c:if>
-														>&nbsp;
-														<c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
+																<c:if test="${answer.answer==status.index+1}">
+																	checked="checked"
+																</c:if>>
+														&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/>
+														<br />
 													</c:forEach>
 												</c:when>
 												<c:when test="${question.type==8}">
@@ -228,7 +228,9 @@
 												</c:when>
 												<c:when test="${question.type==9}">
 													<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
-														<input type="checkbox" disabled="disabled" id="${elementIdPrefix}checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}">&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
+														<input type="checkbox" disabled="disabled" id="${elementIdPrefix}checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}">
+														&nbsp;<label for="${elementIdPrefix}checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}"><c:out value="${answerOption.answerOption}" escapeXml="true"/></label>
+														<br />
 													</c:forEach>
 												</c:when>
 												<c:when test="${question.type==10}">
@@ -239,7 +241,7 @@
 															</td>
 															<td>
 																<c:set var="longitude"><c:out  value='${answer.answer}'/></c:set>
-																<input type="text" size="10" readonly="readonly" value="${longitude}"/>
+																<input type="text" size="10" readonly="readonly" value="${longitude}">
 																<label><fmt:message key="label.learning.longlat.longitude.unit" /></label><br />
 															</td>
 															<c:if test="${not empty question.answerOptions and not empty longitude}">
@@ -253,8 +255,9 @@
 																<label><fmt:message key="label.learning.longlat.latitude" /></label>
 															</td>
 															<td>
-																<input type="text" size="10" readonly="readonly" id="${elementIdPrefix}latitude-record${recordStatus.index+1}-question${questionStatus.index+1}" />
-																<label><fmt:message key="label.learning.longlat.latitude.unit" /></label><br />
+																<input type="text" size="10" readonly="readonly" id="${elementIdPrefix}latitude-record${recordStatus.index+1}-question${questionStatus.index+1}">
+																<label><fmt:message key="label.learning.longlat.latitude.unit" /></label>
+																<br />
 															</td>
 														</tr>
 													</table>
Index: lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -110,7 +110,7 @@
 										<td class="fixedCellHeight ${questionStatus.first ? 'border-thick' : ''}">
 										<c:choose>
 											<c:when test="${question.type==1}">
-												<input type="text" size="45" readonly="readonly" value="<c:out  value='${answer.answer}'/>" />
+												<input type="text" size="45" readonly="readonly" value="<c:out  value='${answer.answer}'/>">
 											</c:when>
 											<c:when test="${question.type==2}">
 												<textarea cols="35" 
@@ -125,10 +125,10 @@
 												 readonly="readonly">${answer.answer}</textarea>
 											</c:when>
 											<c:when test="${question.type==3}">
-												<input type="text" size="10" readonly="readonly" value="<c:out  value='${answer.answer}'/>"/>
+												<input type="text" size="10" readonly="readonly" value="<c:out  value='${answer.answer}'/>">
 											</c:when>
  											<c:when test="${question.type==4}">
-												<input type="text" size="20" readonly="readonly" value="${answer.answer}" />
+												<input type="text" size="20" readonly="readonly" value="${answer.answer}">
 											</c:when>
 											<c:when test="${question.type==5 || question.type==6}">
 												<c:choose>
@@ -151,11 +151,11 @@
 																	<td>
 																</c:if>
 																<input type="radio" readonly="readonly" 
-																<c:if test="${answer.answer==status.index+1}">
-																checked="checked"
-																</c:if>
-																>&nbsp;
-																<c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
+																	<c:if test="${answer.answer==status.index+1}">
+																		checked="checked"
+																	</c:if>>
+																&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/>
+																<br />
 															</c:forEach>
 														</td>
 													</tr>
@@ -184,7 +184,9 @@
 																	</td>
 																	<td>
 																</c:if>
-																<input type="checkbox" disabled="disabled" id="checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}">&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
+																<input type="checkbox" disabled="disabled" id="checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}">
+																&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/>
+																<br />
 															</c:forEach>
 														</td>
 													</tr>
@@ -198,7 +200,7 @@
 														</td>
 														<td>
 															<c:set var="longitude"><c:out  value='${answer.answer}'/></c:set>
-															<input type="text" size="10" readonly="readonly" value="${longitude}"/>
+															<input type="text" size="10" readonly="readonly" value="${longitude}">
 															<label><fmt:message key="label.learning.longlat.longitude.unit" /></label><br />
 														</td>
 													</tr>
@@ -207,7 +209,7 @@
 															<label><fmt:message key="label.learning.longlat.latitude" /></label>
 														</td>
 														<td>
-														<input type="text" size="10" readonly="readonly" id="latitude-record${recordStatus.index+1}-question${questionStatus.index+1}" />
+														<input type="text" size="10" readonly="readonly" id="latitude-record${recordStatus.index+1}-question${questionStatus.index+1}">
 														<label><fmt:message key="label.learning.longlat.latitude.unit" /></label><br />
 														</td>
 													</tr>
Index: lams_tool_forum/web/jsps/admin/config.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_forum/web/jsps/admin/config.jsp	(.../config.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/admin/config.jsp	(.../config.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -29,7 +29,7 @@
 					<form:checkbox path="keepLearnerContent"/>
 					<fmt:message key="admin.keep.learner.content" /></label>
 				</div>
-				<input type="submit" class="btn btn-primary pull-right"><fmt:message key="admin.button.save" /></input>
+				<button type="submit" class="btn btn-primary pull-right" ><fmt:message key="admin.button.save" /></button>
 			</form:form>
 			
 		<div id="footer"></div>
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -52,13 +52,13 @@
 	<body class="stripes" onLoad="init()">
 	
 		<form:form action="update.do" method="post" id="forumForm" modelAttribute="forumForm" enctype="multipart/form-data" 
-		onsubmit="return verifyAllowRateMessagesCheckbox();">
+				onsubmit="return verifyAllowRateMessagesCheckbox();">
 
 			<form:hidden path="toolContentID" />
 			<form:hidden path="sessionMapID" />
 			<form:hidden path="contentFolderID" />
 			<form:hidden path="currentTab" id="currentTab" />
-			<input type="hidden" name="mode" value="${mode}"/>
+			<input type="hidden" name="mode" value="${mode}">
 			
 			<c:set var="title"><fmt:message key="activity.title" /></c:set>
 			<lams:Page title="${title}" type="navbar" formID="forumForm">
Index: lams_tool_lamc/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18 -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_lamc/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
+++ lams_tool_lamc/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -62,9 +62,9 @@
 			</c:if>
 
 			<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}">
-				<input type="submit" name="forwardtoReflection" class="button">
+				<button type="submit" name="forwardtoReflection" class="btn">
 					<fmt:message key="label.continue" />
-				</input>
+				</button>
 			</c:if>
 			</div>
 			<div id="footer"></div>
Index: lams_tool_laqa/web/monitoring/dateRestriction.jsp
===================================================================
diff -u -r7ea9b852e5fe8dc5688f983f162064d862f147de -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_laqa/web/monitoring/dateRestriction.jsp	(.../dateRestriction.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
+++ lams_tool_laqa/web/monitoring/dateRestriction.jsp	(.../dateRestriction.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -47,7 +47,7 @@
 	<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
 		<div class="form-group">
 		<label for="datetime"><fmt:message key="monitor.summary.after.date" />&nbsp;
-		<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline"/>
+		<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline">
 		</label>							
 		<a	href="javascript:storeShowOtherAnswersAfterDeadline(); setSubmissionDeadline();" class="btn btn-default">
 			<fmt:message key="monitor.summary.set.restriction" />
@@ -70,7 +70,7 @@
 			<input type="checkbox" name="showOtherAnswersAfterDeadline" id="show-other-answers-after-deadline" value="1" 
 				<c:if test="${empty submissionDeadline}">disabled="disabled"</c:if>
 				<c:if test="${content.showOtherAnswersAfterDeadline}">checked="checked"</c:if>
-			></input>
+			>
 			<fmt:message key="label.allow.review.other.responses" />
 		</label>
 	</div>
Index: lams_tool_mindmap/web/common/mapjs.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -434,7 +434,7 @@
 		<div style="display:inline" role="group">
         <a href="#" class="btn btn-default btn-sm launch-fullscreen pull-right loffset5" id="expand" onclick="javascript:launchIntoFullscreen()"><i class="fa fa-arrows-alt" aria-hidden="true"></i></a> 
         <a href="#" class="btn btn-default btn-sm exit-fullscreen pull-right loffset5" id="shrink" onclick="javascript:exitFullscreen()" style="display: none;"><i class="fa fa-compress" aria-hidden="true"></i></a> 
-		<input type="text" id="background-color" class='updateStyle form-control input-sm' data-mm-target-property='background' size="7" width="180px"></input>
+		<input type="text" id="background-color" class='updateStyle form-control input-sm' data-mm-target-property='background' size="7" width="180px">
 		</div>
 		 
 		<div>
@@ -453,8 +453,8 @@
 			<a href="#" class="removeSubIdea btn btn-default btn-sm" title="<fmt:message key='label.delete.idea'/>"><i class="fa fa-lg fa-trash-o"></i><span class="hidden-xs">&nbsp;<fmt:message key='label.delete.idea'/></span></a>
 	<%-- Not yet implemented in back end  --%> 
 	<%-- 		<input type="button" data-mm-action="export-image" value="Export To Image"/>  --%> 
-	<%--  		<input type="button" class="insertRoot" value="add root node"></input>  --%> 
-	<%-- 		<input type="button" class="makeSelectedNodeRoot" value="make root"></input>  --%> 
+	<%--  		<input type="button" class="insertRoot" value="add root node">  --%> 
+	<%-- 		<input type="button" class="makeSelectedNodeRoot" value="make root">  --%> 
 	 	</c:if>
 	 		</div>
  		</div>
Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -37,9 +37,9 @@
 			<form:hidden path="method" value="finish"/>
 			<c:choose>
 				<c:when test="${reflectOnActivity}">
-					<input type="submit" name="method" class="button">
+					<button type="submit" name="method" class="btn">
 						<fmt:message key="button.continue" />
-					</input>
+					</button>
 				</c:when>
 				<c:otherwise>
 					<a href="#nogo" class="button" id="finishButton" onclick="submitForm('finish')">
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r37c404bc2d0032716112057bebc1314cbc30d102
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
@@ -110,7 +110,7 @@
 				</c:when>
 
 				<c:when test="${voteGeneralLearnerFlowDTO.reflection != 'true' || !hasEditRight}">
-					<input type="submit" name="learnerFinished" id="finishButton" onclick="javascript:submitMethod('learnerFinished')"
+					<button type="submit" name="learnerFinished" id="finishButton" onclick="javascript:submitMethod('learnerFinished')"
 						class="btn btn-primary voffset10 pull-right"
 						value='
 							<c:choose>
@@ -124,7 +124,7 @@
 						     '
 						/>
 
-					</input>
+					</button>
 				</c:when>
 
 				<c:otherwise>