Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
===================================================================
diff -u -rc82d171dbdd8918839e396f2851d6e11b68bb9e8 -r7b67ac0353336da9b914a82d30936b7ffe49c534
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision c82d171dbdd8918839e396f2851d6e11b68bb9e8)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 7b67ac0353336da9b914a82d30936b7ffe49c534)
@@ -186,6 +186,9 @@
 		scratchieItem.setDisplayOrder(i);
 	    }
 	    i++;
+
+	    // prepare other version data for displaying
+	    qbService.fillVersionMap(scratchieItem.getQbQuestion());
 	}
 
 	//display confidence providing activities
@@ -435,6 +438,9 @@
 	itemList.add(item);
 	ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
 
+	// prepare other version data for displaying
+	qbService.fillVersionMap(item.getQbQuestion());
+
 	// set session map ID so that itemlist.jsp can get sessionMAP
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return "pages/authoring/parts/itemlist";
@@ -574,6 +580,9 @@
 		    false);
 	}
 
+	// prepare other version data for displaying
+	qbService.fillVersionMap(item.getQbQuestion());
+
 	// set session map ID so that itemlist.jsp can get sessionMAP
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, form.getSessionMapID());
 	return "pages/authoring/parts/itemlist";
@@ -667,6 +676,21 @@
 	return "pages/authoring/parts/itemlist";
     }
 
+    @RequestMapping("/changeItemQuestionVersion")
+    private String changeItemQuestionVersion(@RequestParam int itemIndex, @RequestParam long newQbQuestionUid,
+	    HttpServletRequest request) {
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
+	List<ScratchieItem> rList = new ArrayList<>(itemList);
+	ScratchieItem item = rList.get(itemIndex);
+	QbQuestion newQbQuestion = qbService.getQuestionByUid(newQbQuestionUid);
+	qbService.fillVersionMap(newQbQuestion);
+	item.setQbQuestion(newQbQuestion);
+
+	request.setAttribute(ScratchieConstants.ATTR_ITEM_LIST, itemList);
+	return "pages/authoring/parts/itemlist";
+    }
+
     // ----------------------- Options functions ---------------
 
     /**
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r7b67ac0353336da9b914a82d30936b7ffe49c534
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7b67ac0353336da9b914a82d30936b7ffe49c534)
@@ -24,6 +24,18 @@
 		#add-question-div {
 			margin-top: -5px;
 		}
+		.question-type-alert {
+			white-space: nowrap;
+			padding-top: 2px;
+			padding-bottom: 2px;
+		}
+		.newer-version-prompt {
+			text-align: left;
+			margin-top: 6px;
+		}
+		.question-version-dropdown {
+			margin-top: 3px;
+		}
 	</style>
 	
 	<script>
Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
diff -u -radd24141d43ff78942c251760e1614925db89464 -r7b67ac0353336da9b914a82d30936b7ffe49c534
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision add24141d43ff78942c251760e1614925db89464)
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7b67ac0353336da9b914a82d30936b7ffe49c534)
@@ -68,6 +68,22 @@
 			}
 		);
 	}
+	
+	function changeItemQuestionVersion(itemIndex, newQbQuestionUid) {
+		var url = "<c:url value="/authoring/changeItemQuestionVersion.do"/>";
+		$(itemTargetDiv).load(
+			url,
+			{
+				itemIndex: itemIndex,
+				sessionMapID: "${sessionMapID}",
+				newQbQuestionUid : newQbQuestionUid
+			},
+			function(){
+				refreshThickbox();
+			}
+		);
+	}
+	
 	function initNewItemHref() {
 		var itemTypeDropdown = document.getElementById("item-type");
 		var itemType = itemTypeDropdown.value;
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rc82d171dbdd8918839e396f2851d6e11b68bb9e8 -r7b67ac0353336da9b914a82d30936b7ffe49c534
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c82d171dbdd8918839e396f2851d6e11b68bb9e8)
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7b67ac0353336da9b914a82d30936b7ffe49c534)
@@ -60,12 +60,10 @@
 				</td>
 				<td style="padding-top:15px; padding-bottom:15px;">
 					<c:out value="${item.qbQuestion.name}" escapeXml="true"/>
-					
-				    <span class='pull-right alert-info btn-xs loffset5 roffset5'>
-				    	v.&nbsp;${item.qbQuestion.version}
-				    </span>
-				    
-				   	<span class='pull-right alert-info btn-xs'>
+				</td>
+				
+				<td style="width:1%">
+					<span class='alert-info btn-xs question-type-alert'>
 						<c:choose>
 							<c:when test="${item.qbQuestion.type == 1}">
 								<fmt:message key="label.type.multiple.choice" />
@@ -76,7 +74,42 @@
 						</c:choose>
 	       			</span>
 				</td>
+				<td style="width:1%">
+				    <c:set var="maxQuestionVersion" value="1" />
+				    <c:choose>
+						<c:when test="${fn:length(item.qbQuestion.versionMap) == 1}">
+							<button class="btn btn-default btn-xs dropdown-toggle2 question-version-dropdown" disabled="disabled">
+							    Version ${item.qbQuestion.version}
+							</button>
+						</c:when>
+			
+						<c:otherwise>
+							<div class="dropdown question-version-dropdown">
+								<button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+							    	Version ${item.qbQuestion.version}&nbsp;<span class="caret"></span>
+								</button>
+								
+								<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+									<c:forEach items="${item.qbQuestion.versionMap}" var="otherVersion">
+										 <c:set var="maxQuestionVersion" value="${otherVersion.key}" />
+										 
+							    		<li <c:if test="${item.qbQuestion.version == otherVersion.key}">class="disabled"</c:if>>
+							    			<a href="#nogo" onclick="javascript:changeItemQuestionVersion(${status.index}, ${otherVersion.value});">Version ${otherVersion.key}</a>
+							    		</li>
+							    	</c:forEach>
+								</ul>
+	
+							</div>			
+						</c:otherwise>
+					</c:choose>
+				</td>
 				
+				<td style="width: 3%">
+					<c:if test="${item.qbQuestion.version < maxQuestionVersion}">
+						<i class="fa fa-exclamation newer-version-prompt" title="There is a newer version of this question"></i>
+					</c:if>
+				</td>
+				
 				<c:if test="${!isAuthoringRestricted}">
 					<td class="arrows" style="width:5%">
 						<c:if test="${not status.first}">