Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r72c9800d4076fa450caff0943dd4de41399c83e0 -r28a07fe5e236a1481734372dc50a5e57edcbea23
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 28a07fe5e236a1481734372dc50a5e57edcbea23)
@@ -879,7 +879,7 @@
 authoring.tbl.desc.question  =These questions are for iRA and tRA. Click "Create Question" to add more questions. Turn on "Enable confidence levels" to have the learners' confidence levels from the iRA shown on the tRA screen.
 authoring.tbl.desc.ae  =State the questions for AE. Click "Create Question" to add more questions.
 
-
+#QB questions#
 label.question.type.multiple.choice  =Multiple choice
 label.question.type.matching.pairs  =Matching pairs
 label.question.type.short.answer  =Short answer
@@ -888,5 +888,17 @@
 label.question.type.essay  =Essay
 label.question.type.ordering  =Ordering
 label.question.type.mark.hedging  =Mark hedging
+label.search.question.bank  =Search question bank
+label.question.type  =Type:
+label.question.successfully.imported  =Question successfully imported
+label.  =
+label.  =
+label.  =
+label.  =
+label.  =
+label.  =
+label.  =
+label.  =
+label.  =
 
 #======= End labels: Exported 872 labels for en AU =====
Index: lams_central/web/qb/qbQuestionDetails.jsp
===================================================================
diff -u -r69448cd1b22b367f5221efed0730303edc27404c -r28a07fe5e236a1481734372dc50a5e57edcbea23
--- lams_central/web/qb/qbQuestionDetails.jsp	(.../qbQuestionDetails.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
+++ lams_central/web/qb/qbQuestionDetails.jsp	(.../qbQuestionDetails.jsp)	(revision 28a07fe5e236a1481734372dc50a5e57edcbea23)
@@ -12,14 +12,14 @@
 	
 	<a id="import-button" class="btn btn-xs btn-default pull-right button-add-item" href="#nogo"
 		title="Import question from the question bank">
-		Import
+		<fmt:message key="button.import"/>
 	</a>
 	
 	<div class="pull-right">
 		<c:choose>
 			<c:when test="${fn:length(otherVersions) == 1}">
 				<button class="btn btn-default btn-xs dropdown-toggle2" disabled="disabled">
-				    Version ${question.version}
+				    <fmt:message key="label.version"/> &nbsp; ${question.version}
 				</button>
 			</c:when>
 
@@ -50,38 +50,95 @@
 	</div>
  		
 	<c:choose>
-		<c:when test="${question.type == 1}">
+		<c:when test="${question.type == 1 || question.type == 3 || question.type == 4 || question.type == 8}">
 			<table class="table table-striped table-hover table-condensed">
 				<c:forEach var="option" items="${question.qbOptions}" varStatus="i">
+					<c:set var="isOptionCorrect" value="${option.correct || option.maxMark == 1}"/>
 					<tr>
 						<td width="5px" style="padding-right: 0;">
-							<c:if test="${option.correct}">
+							<c:if test="${isOptionCorrect}">
 								<i class="fa fa-check text-success"></i>
 							</c:if>
 						</td>
-							
+
 						<td width="10px">
 							<span 
-								<c:if test="${option.correct}">class="text-success"</c:if>>
+								<c:if test="${isOptionCorrect}">class="text-success"</c:if>>
 								${i.index+1})
 							</span>
 						</td>
 							
 						<td>
-							<c:if test="${option.correct}">
+							<c:if test="${isOptionCorrect}">
 								<div class="text-success">
 							</c:if>
-							<c:out value="${option.name}" escapeXml="false"/>
-							<c:if test="${option.correct}">
+							
+							<c:choose>
+								<c:when test="${question.type == 1 || question.type == 3 || question.type == 8}">
+									<c:out value="${option.name}" escapeXml="false"/>
+								</c:when>
+								<c:otherwise>
+									<c:out value="${option.numericalOption}" escapeXml="false"/>
+								</c:otherwise>
+							</c:choose>
+							
+							<c:if test="${isOptionCorrect}">
 								</div>
 							</c:if>
 						</td>
 					</tr>
 				</c:forEach>
 			</table>
 		</c:when>
-		<c:otherwise>
-		</c:otherwise>
+		
+		<c:when test="${question.type == 2}">
+			<table class="table table-hover table-condensed">
+				<c:forEach var="option" items="${question.qbOptions}" varStatus="i">
+					<tr>
+						<td width="10px">
+							<span 
+								<c:if test="${option.correct}">class="text-success"</c:if>>
+								${i.index+1})
+							</span>
+						</td>	
+						<td style="width: 100px;">
+							<c:out value="${option.matchingPair}" escapeXml="false" />
+						</td>
+						
+						<td >
+							<c:out value="${option.name}" escapeXml="false" />
+						</td>
+					</tr>
+				</c:forEach>
+			</table>
+		</c:when>
+		
+		<c:when test="${question.type == 5}">
+			<div class="voffset10">
+				Correct answer: ${question.correctAnswer}
+			</div>
+		</c:when>
+		
+		<c:when test="${question.type == 6}">
+		</c:when>
+		
+		<c:when test="${question.type == 7}">
+			<table class="table table-striped table-hover table-condensed">
+				<c:forEach var="option" items="${question.qbOptions}" varStatus="i">
+					<tr>
+						<td width="10px">
+							<span>
+								${i.index+1})
+							</span>
+						</td>
+							
+						<td>
+							<c:out value="${option.name}" escapeXml="false"/>
+						</td>
+					</tr>
+				</c:forEach>
+			</table>
+		</c:when>
 	</c:choose>
 </div>
 </div>
Index: lams_central/web/qb/search.jsp
===================================================================
diff -u -r69448cd1b22b367f5221efed0730303edc27404c -r28a07fe5e236a1481734372dc50a5e57edcbea23
--- lams_central/web/qb/search.jsp	(.../search.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
+++ lams_central/web/qb/search.jsp	(.../search.jsp)	(revision 28a07fe5e236a1481734372dc50a5e57edcbea23)
@@ -104,6 +104,10 @@
 			font-size: 18px;
 		}
 		
+		#question-type {
+			display: inline-flex;
+		}
+		
 		/*----------STICKY FOOTER----------------*/
 		html {
 		    position: relative;
@@ -148,8 +152,8 @@
 				iconSet: 'fontAwesome',
 			   	colNames:[
 				   	'questionUid',
-					"Questions",
-					"questionDescription"
+					'<fmt:message key="authoring.section.questions"/>',
+					'questionDescription'
 				],
 			   	colModel:[
 			   		{name:'questionUid', index:'questionUid', width:0, hidden: true},
@@ -211,7 +215,7 @@
 						}
 
 						//show successfull notification
-	                	$.growlUI('<i class="fa fa-lg fa-download"></i> Question successfully imported');
+	                	$.growlUI('<i class="fa fa-lg fa-download"></i> <fmt:message key="label.question.successfully.imported" />');
 					}
 				);
 	        });
@@ -270,7 +274,7 @@
 <body>
 	<div id="main-panel" class="panel panel-default">
 		<div class="panel-heading panel-title">
-			Search question bank
+			<fmt:message key="label.search.question.bank"/>
 			
 			<button type="button" id="close-button" class="close" data-dismiss="modal" aria-label="Close"
 				onclick="javascript:self.parent.tb_remove();">
@@ -280,48 +284,48 @@
 			
 		<div class="panel-body">
 		
-			<div id="search-widgets">
+			<div id="search-widgets" class="input-group-sm">
 				<input type="text" id="filter-questions" class="form-control" placeholder="Contains text" 
 					onkeydown="doSearch(arguments[0]||event)" />
 		
 				<c:if test="${!empty questionTypesAvailable}">
-					<span class="form-control loffset5 disabled-span">
-					Type:
-					<select id="question-type" onchange="gridSearch();">
-						<c:forTokens items="${questionTypesAvailable}" delims="," var="questionTypeIter">
-	  						<option value="${questionTypeIter}"
-	  							<c:if test="${questionTypeIter == questionType}">selected="selected"</c:if>>
-	  							
-								<c:choose>
-									<c:when test="${questionTypeIter == 1}">
-										<fmt:message key="label.question.type.multiple.choice" />
-									</c:when>
-									<c:when test="${questionTypeIter == 2}">
-										<fmt:message key="label.question.type.matching.pairs" />
-									</c:when>
-									<c:when test="${questionTypeIter == 3}">
-										<fmt:message key="label.question.type.short.answer" />
-									</c:when>
-									<c:when test="${questionTypeIter == 4}">
-										<fmt:message key="label.question.type.numerical" />
-									</c:when>
-									<c:when test="${questionTypeIter == 5}">
-										<fmt:message key="label.question.type.true.false" />
-									</c:when>
-									<c:when test="${questionTypeIter == 6}">
-										<fmt:message key="label.question.type.essay" />
-									</c:when>
-									<c:when test="${questionTypeIter == 7}">
-										<fmt:message key="label.question.type.ordering" />
-									</c:when>
-									<c:when test="${questionTypeIter == 8}">
-										<fmt:message key="label.question.type.mark.hedging" />
-									</c:when>
-								</c:choose>
-							</option>
-						</c:forTokens>
-					</select>
-					</span>
+					<div class="loffset10 input-group-sm">
+						<fmt:message key="label.question.type" />
+						<select id="question-type" onchange="gridSearch();" class="form-control">
+							<c:forTokens items="${questionTypesAvailable}" delims="," var="questionTypeIter">
+		  						<option value="${questionTypeIter}"
+		  							<c:if test="${questionTypeIter == questionType}">selected="selected"</c:if>>
+		  							
+									<c:choose>
+										<c:when test="${questionTypeIter == 1}">
+											<fmt:message key="label.question.type.multiple.choice" />
+										</c:when>
+										<c:when test="${questionTypeIter == 2}">
+											<fmt:message key="label.question.type.matching.pairs" />
+										</c:when>
+										<c:when test="${questionTypeIter == 3}">
+											<fmt:message key="label.question.type.short.answer" />
+										</c:when>
+										<c:when test="${questionTypeIter == 4}">
+											<fmt:message key="label.question.type.numerical" />
+										</c:when>
+										<c:when test="${questionTypeIter == 5}">
+											<fmt:message key="label.question.type.true.false" />
+										</c:when>
+										<c:when test="${questionTypeIter == 6}">
+											<fmt:message key="label.question.type.essay" />
+										</c:when>
+										<c:when test="${questionTypeIter == 7}">
+											<fmt:message key="label.question.type.ordering" />
+										</c:when>
+										<c:when test="${questionTypeIter == 8}">
+											<fmt:message key="label.question.type.mark.hedging" />
+										</c:when>
+									</c:choose>
+								</option>
+							</c:forTokens>
+						</select>
+					</div>
 				</c:if>
 			</div>
 
@@ -341,7 +345,7 @@
 		<div class="panel-heading">
         	<div class="pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5" style="display: inline;">
-					Close
+					<fmt:message key="button.close" />
 				</a>
 			</div>	
       	</div>
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r28a07fe5e236a1481734372dc50a5e57edcbea23
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 28a07fe5e236a1481734372dc50a5e57edcbea23)
@@ -351,5 +351,6 @@
 message.qb.modified.update =The question in Question Bank will be updated
 message.qb.modified.version =A new version of the question will be created in Question Bank
 message.qb.modified.new =A new question will be created in Question Bank
+label.import.from.question.bank  =Import from question bank
 
 #======= End labels: Exported 337 labels for en AU =====
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -r69448cd1b22b367f5221efed0730303edc27404c -r28a07fe5e236a1481734372dc50a5e57edcbea23
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 69448cd1b22b367f5221efed0730303edc27404c)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 28a07fe5e236a1481734372dc50a5e57edcbea23)
@@ -171,7 +171,7 @@
 		
 			<a href="<lams:LAMSURL/>/searchQB/start.do?returnUrl=${returnUrl}&toolContentId=${sessionMap.toolContentID}&KeepThis=true&TB_iframe=true&modal=true" 
 				class="btn btn-default btn-xs thickbox"> 
-				Import from question bank
+				<fmt:message key="label.import.from.question.bank" />
 			</a>
 		</div>