Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
===================================================================
diff -u -r0b1e74374b821758fdda7835d8d283bf84fa8db0 -rce08b5834386d861110869e90237174b8969f3a0
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java	(.../QbCollectionController.java)	(revision 0b1e74374b821758fdda7835d8d283bf84fa8db0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java	(.../QbCollectionController.java)	(revision ce08b5834386d861110869e90237174b8969f3a0)
@@ -1,255 +1,254 @@
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
- *
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-package org.lamsfoundation.lams.web.qb;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.qb.model.QbCollection;
-import org.lamsfoundation.lams.qb.model.QbQuestion;
-import org.lamsfoundation.lams.qb.service.IQbService;
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.CommonConstants;
-import org.lamsfoundation.lams.util.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.session.SessionManager;
-import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-@Controller
-@RequestMapping("/qb/collection")
-public class QbCollectionController {
-    private static Logger log = Logger.getLogger(QbCollectionController.class);
-
-    @Autowired
-    @Qualifier("centralMessageService")
-    private MessageService messageService;
-
-    @Autowired
-    private IQbService qbService;
-
-    @RequestMapping("/show")
-    public String showUserCollections(Model model) throws Exception {
-	Integer userId = getUserId();
-
-	Collection<QbCollection> collections = qbService.getUserCollections(userId);
-	model.addAttribute("collections", collections);
-
-	Map<Long, Integer> questionCount = collections.stream().collect(
-		Collectors.toMap(QbCollection::getUid, c -> qbService.getCountCollectionQuestions(c.getUid(), null)));
-	model.addAttribute("questionCount", questionCount);
-
-	model.addAttribute("createCollectionAllowed",
-		Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW));
-
-	return "qb/collectionList";
-    }
-
-    @RequestMapping("/showOne")
-    public String showOneCollection(@RequestParam long collectionUid, Model model) throws Exception {
-	model.addAttribute("collection", qbService.getCollection(collectionUid));
-	model.addAttribute("availableOrganisations",
-		qbService.getShareableWithOrganisations(collectionUid, getUserId()));
-	model.addAttribute("questionCount", qbService.getCountCollectionQuestions(collectionUid, null));
-	model.addAttribute("isQtiExportEnabled", Configuration.getAsBoolean(ConfigurationKeys.QB_QTI_ENABLE));
-	return "qb/collection";
-    }
-
-    @RequestMapping("/getCollectionGridData")
-    @ResponseBody
-    public String getCollectionGridData(@RequestParam long collectionUid,
-	    @RequestParam(defaultValue = "false") boolean showUsage, HttpServletRequest request,
-	    HttpServletResponse response) {
-	response.setContentType("text/xml; charset=utf-8");
-
-	int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE);
-	int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS);
-	String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD);
-	String sortBy = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true);
-	Boolean isSearch = WebUtil.readBooleanParam(request, CommonConstants.PARAM_SEARCH);
-	String searchString = isSearch ? WebUtil.readStrParam(request, "name", true) : null;
-
-	int offset = (page - 1) * rowLimit;
-	List<QbQuestion> questions = qbService.getCollectionQuestions(collectionUid, offset, rowLimit, sortBy,
-		sortOrder, searchString);
-	int total = qbService.getCountCollectionQuestions(collectionUid, searchString);
-	int maxPages = total / rowLimit + 1;
-	return toGridXML(questions, page, maxPages, total, showUsage, false);
-    }
-
-    @RequestMapping("/getQuestionVersionGridData")
-    @ResponseBody
-    public String getQuestionVersionGridData(@RequestParam int qbQuestionId, HttpServletRequest request,
-	    HttpServletResponse response) {
-	response.setContentType("text/xml; charset=utf-8");
-
-	List<QbQuestion> questions = qbService.getQuestionsByQuestionId(qbQuestionId);
-	questions = questions.subList(1, questions.size());
-	return toGridXML(questions, 1, 1, questions.size(), true, true);
-    }
-
-    private String toGridXML(List<QbQuestion> questions, int page, int maxPages, int totalCount, boolean showUsage,
-	    boolean isVersionGrid) {
-	try {
-	    Document document = WebUtil.getDocument();
-
-	    // root element
-	    Element rootElement = document.createElement(CommonConstants.ELEMENT_ROWS);
-
-	    Element pageElement = document.createElement(CommonConstants.ELEMENT_PAGE);
-	    pageElement.appendChild(document.createTextNode(String.valueOf(page)));
-	    rootElement.appendChild(pageElement);
-
-	    Element totalPageElement = document.createElement(CommonConstants.ELEMENT_TOTAL);
-	    totalPageElement.appendChild(document.createTextNode(String.valueOf(maxPages)));
-	    rootElement.appendChild(totalPageElement);
-
-	    Element recordsElement = document.createElement(CommonConstants.ELEMENT_RECORDS);
-	    recordsElement.appendChild(document.createTextNode(String.valueOf(totalCount)));
-	    rootElement.appendChild(recordsElement);
-
-	    for (QbQuestion question : questions) {
-		String uid = question.getUid().toString();
-		Element rowElement = document.createElement(CommonConstants.ELEMENT_ROW);
-		rowElement.setAttribute(CommonConstants.ELEMENT_ID, uid);
-
-		// the last cell is for creating stats button
-		String usage = showUsage
-			? String.valueOf(isVersionGrid ? qbService.getCountQuestionActivitiesByUid(question.getUid())
-				: qbService.getCountQuestionActivitiesByQuestionId(question.getQuestionId()))
-			: null;
-		boolean hasVersions = qbService.countQuestionVersions(question.getQuestionId()) > 1;
-		String[] data = { question.getQuestionId().toString(),
-			WebUtil.removeHTMLtags(question.getName()).trim(),
-			isVersionGrid ? null : question.getType().toString(), question.getVersion().toString(), usage,
-			uid, String.valueOf(hasVersions) };
-
-		for (String cell : data) {
-		    Element cellElement = document.createElement(CommonConstants.ELEMENT_CELL);
-		    if (cell == null) {
-			cell = "";
-		    }
-		    cellElement.appendChild(document.createTextNode(cell));
-		    rowElement.appendChild(cellElement);
-		}
-		rootElement.appendChild(rowElement);
-	    }
-
-	    document.appendChild(rootElement);
-
-	    return WebUtil.getStringFromDocument(document);
-
-	} catch (Exception e) {
-	    log.error("Error while generating Question Bank collection jqGrid XML data", e);
-	}
-
-	return null;
-    }
-
-    @RequestMapping("/removeCollectionQuestion")
-    @ResponseBody
-    public void removeCollectionQuestion(@RequestParam long collectionUid, @RequestParam int qbQuestionId) {
-	qbService.removeQuestionFromCollectionByQuestionId(collectionUid, qbQuestionId);
-    }
-
-    @RequestMapping("/addCollectionQuestion")
-    @ResponseBody
-    public void addCollectionQuestion(@RequestParam long targetCollectionUid, @RequestParam boolean copy,
-	    @RequestParam int qbQuestionId) {
-	if (!Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_TRANSFER_ALLOW)) {
-	    throw new SecurityException("Transfering questions between collections is disabled");
-	}
-	qbService.addQuestionToCollection(targetCollectionUid, qbQuestionId, copy);
-    }
-
-    @RequestMapping("/addCollection")
-    @ResponseBody
-    public void addCollection(@RequestParam String name) {
-	if (!Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW)) {
-	    throw new SecurityException("New collections are disabled");
-	}
-	qbService.addCollection(getUserId(), name);
-    }
-
-    @RequestMapping("/changeCollectionName")
-    @ResponseBody
-    public String changeCollectionName(@RequestParam(name = "pk") long collectionUid,
-	    @RequestParam(name = "value") String name) {
-	Collection<QbCollection> collections = qbService.getUserCollections(getUserId());
-	name = name.trim();
-	for (QbCollection collection : collections) {
-	    if (collection.getUid().equals(collectionUid)) {
-		if (collection.getUserId() == null) {
-		    // can not change public collection name
-		    return "false";
-		}
-	    } else if (name.equalsIgnoreCase(collection.getName())) {
-		// a collection with the same name already exists
-		return "false";
-	    }
-	}
-	qbService.changeCollectionName(collectionUid, name);
-	return "true";
-    }
-
-    @RequestMapping("/removeCollection")
-    @ResponseBody
-    public void removeCollection(@RequestParam long collectionUid) {
-	qbService.removeCollection(collectionUid);
-    }
-
-    @RequestMapping("/shareCollection")
-    @ResponseBody
-    public void shareCollection(@RequestParam long collectionUid, @RequestParam int organisationId) {
-	qbService.shareCollection(collectionUid, organisationId);
-    }
-
-    @RequestMapping("/unshareCollection")
-    @ResponseBody
-    public void unshareCollection(@RequestParam long collectionUid, @RequestParam int organisationId) {
-	qbService.unshareCollection(collectionUid, organisationId);
-    }
-
-    private Integer getUserId() {
-	HttpSession ss = SessionManager.getSession();
-	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	return user != null ? user.getUserID() : null;
-    }
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.web.qb;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.outcome.Outcome;
+import org.lamsfoundation.lams.qb.model.QbCollection;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
+import org.lamsfoundation.lams.qb.service.IQbService;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.CommonConstants;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+@Controller
+@RequestMapping("/qb/collection")
+public class QbCollectionController {
+    private static Logger log = Logger.getLogger(QbCollectionController.class);
+
+    @Autowired
+    @Qualifier("centralMessageService")
+    private MessageService messageService;
+
+    @Autowired
+    private IQbService qbService;
+
+    @RequestMapping("/show")
+    public String showUserCollections(Model model) throws Exception {
+	Integer userId = getUserId();
+
+	Collection<QbCollection> collections = qbService.getUserCollections(userId);
+	model.addAttribute("collections", collections);
+
+	Map<Long, Integer> questionCount = collections.stream().collect(
+		Collectors.toMap(QbCollection::getUid, c -> qbService.getCountCollectionQuestions(c.getUid(), null)));
+	model.addAttribute("questionCount", questionCount);
+
+	model.addAttribute("createCollectionAllowed",
+		Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW));
+
+	return "qb/collectionList";
+    }
+
+    @RequestMapping("/showOne")
+    public String showOneCollection(@RequestParam long collectionUid, Model model) throws Exception {
+	model.addAttribute("collection", qbService.getCollection(collectionUid));
+	model.addAttribute("availableOrganisations",
+		qbService.getShareableWithOrganisations(collectionUid, getUserId()));
+	model.addAttribute("questionCount", qbService.getCountCollectionQuestions(collectionUid, null));
+	model.addAttribute("isQtiExportEnabled", Configuration.getAsBoolean(ConfigurationKeys.QB_QTI_ENABLE));
+	return "qb/collection";
+    }
+
+    @RequestMapping(path = "/getCollectionGridData", produces = "text/xml; charset=utf-8")
+    @ResponseBody
+    public String getCollectionGridData(@RequestParam long collectionUid, @RequestParam String view,
+	    HttpServletRequest request) {
+
+	int page = WebUtil.readIntParam(request, CommonConstants.PARAM_PAGE);
+	int rowLimit = WebUtil.readIntParam(request, CommonConstants.PARAM_ROWS);
+	String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD);
+	String sortBy = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true);
+	Boolean isSearch = WebUtil.readBooleanParam(request, CommonConstants.PARAM_SEARCH);
+	String searchString = isSearch ? WebUtil.readStrParam(request, "name", true) : null;
+
+	int offset = (page - 1) * rowLimit;
+	List<QbQuestion> questions = qbService.getCollectionQuestions(collectionUid, offset, rowLimit, sortBy,
+		sortOrder, searchString);
+	int total = qbService.getCountCollectionQuestions(collectionUid, searchString);
+	int maxPages = total / rowLimit + 1;
+	return toGridXML(questions, page, maxPages, total, view);
+    }
+
+    @RequestMapping(path = "/getQuestionVersionGridData", produces = "text/xml; charset=utf-8")
+    @ResponseBody
+    public String getQuestionVersionGridData(@RequestParam int qbQuestionId, @RequestParam String view) {
+
+	List<QbQuestion> questions = qbService.getQuestionsByQuestionId(qbQuestionId);
+	questions = questions.subList(1, questions.size());
+	return toGridXML(questions, 1, 1, questions.size(), view);
+    }
+
+    private String toGridXML(List<QbQuestion> questions, int page, int maxPages, int totalCount, String view) {
+	try {
+	    Document document = WebUtil.getDocument();
+
+	    // root element
+	    Element rootElement = document.createElement(CommonConstants.ELEMENT_ROWS);
+
+	    Element pageElement = document.createElement(CommonConstants.ELEMENT_PAGE);
+	    pageElement.appendChild(document.createTextNode(String.valueOf(page)));
+	    rootElement.appendChild(pageElement);
+
+	    Element totalPageElement = document.createElement(CommonConstants.ELEMENT_TOTAL);
+	    totalPageElement.appendChild(document.createTextNode(String.valueOf(maxPages)));
+	    rootElement.appendChild(totalPageElement);
+
+	    Element recordsElement = document.createElement(CommonConstants.ELEMENT_RECORDS);
+	    recordsElement.appendChild(document.createTextNode(String.valueOf(totalCount)));
+	    rootElement.appendChild(recordsElement);
+
+	    for (QbQuestion question : questions) {
+		String uid = question.getUid().toString();
+		Element rowElement = document.createElement(CommonConstants.ELEMENT_ROW);
+		rowElement.setAttribute(CommonConstants.ELEMENT_ID, uid);
+
+		// the last cell is for creating stats button
+		String usage = !view.equalsIgnoreCase("list") ? String.valueOf(
+			view.equalsIgnoreCase("version") ? qbService.getCountQuestionActivitiesByUid(question.getUid())
+				: qbService.getCountQuestionActivitiesByQuestionId(question.getQuestionId()))
+			: null;
+		boolean hasVersions = qbService.countQuestionVersions(question.getQuestionId()) > 1;
+		String learningOutcomes = view.equalsIgnoreCase("single")
+			? question.getOutcomes().stream().map(Outcome::getName).collect(Collectors.joining("<br>"))
+			: null;
+
+		String[] data = { question.getQuestionId().toString(),
+			WebUtil.removeHTMLtags(question.getName()).trim(),
+			view.equalsIgnoreCase("version") ? null : question.getType().toString(),
+			question.getVersion().toString(), learningOutcomes, usage, uid, String.valueOf(hasVersions) };
+
+		for (String cell : data) {
+		    Element cellElement = document.createElement(CommonConstants.ELEMENT_CELL);
+		    if (cell == null) {
+			cell = "";
+		    }
+		    cellElement.appendChild(document.createTextNode(cell));
+		    rowElement.appendChild(cellElement);
+		}
+		rootElement.appendChild(rowElement);
+	    }
+
+	    document.appendChild(rootElement);
+
+	    return WebUtil.getStringFromDocument(document);
+
+	} catch (Exception e) {
+	    log.error("Error while generating Question Bank collection jqGrid XML data", e);
+	}
+
+	return null;
+    }
+
+    @RequestMapping("/removeCollectionQuestion")
+    @ResponseBody
+    public void removeCollectionQuestion(@RequestParam long collectionUid, @RequestParam int qbQuestionId) {
+	qbService.removeQuestionFromCollectionByQuestionId(collectionUid, qbQuestionId);
+    }
+
+    @RequestMapping("/addCollectionQuestion")
+    @ResponseBody
+    public void addCollectionQuestion(@RequestParam long targetCollectionUid, @RequestParam boolean copy,
+	    @RequestParam int qbQuestionId) {
+	if (!Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_TRANSFER_ALLOW)) {
+	    throw new SecurityException("Transfering questions between collections is disabled");
+	}
+	qbService.addQuestionToCollection(targetCollectionUid, qbQuestionId, copy);
+    }
+
+    @RequestMapping("/addCollection")
+    @ResponseBody
+    public void addCollection(@RequestParam String name) {
+	if (!Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW)) {
+	    throw new SecurityException("New collections are disabled");
+	}
+	qbService.addCollection(getUserId(), name);
+    }
+
+    @RequestMapping("/changeCollectionName")
+    @ResponseBody
+    public String changeCollectionName(@RequestParam(name = "pk") long collectionUid,
+	    @RequestParam(name = "value") String name) {
+	Collection<QbCollection> collections = qbService.getUserCollections(getUserId());
+	name = name.trim();
+	for (QbCollection collection : collections) {
+	    if (collection.getUid().equals(collectionUid)) {
+		if (collection.getUserId() == null) {
+		    // can not change public collection name
+		    return "false";
+		}
+	    } else if (name.equalsIgnoreCase(collection.getName())) {
+		// a collection with the same name already exists
+		return "false";
+	    }
+	}
+	qbService.changeCollectionName(collectionUid, name);
+	return "true";
+    }
+
+    @RequestMapping("/removeCollection")
+    @ResponseBody
+    public void removeCollection(@RequestParam long collectionUid) {
+	qbService.removeCollection(collectionUid);
+    }
+
+    @RequestMapping("/shareCollection")
+    @ResponseBody
+    public void shareCollection(@RequestParam long collectionUid, @RequestParam int organisationId) {
+	qbService.shareCollection(collectionUid, organisationId);
+    }
+
+    @RequestMapping("/unshareCollection")
+    @ResponseBody
+    public void unshareCollection(@RequestParam long collectionUid, @RequestParam int organisationId) {
+	qbService.unshareCollection(collectionUid, organisationId);
+    }
+
+    private Integer getUserId() {
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	return user != null ? user.getUserID() : null;
+    }
 }
\ No newline at end of file
Index: lams_central/web/qb/collection.jsp
===================================================================
diff -u -r289d71a2af5137360ca926e9b03ca4bfccc4fe86 -rce08b5834386d861110869e90237174b8969f3a0
--- lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision 289d71a2af5137360ca926e9b03ca4bfccc4fe86)
+++ lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision ce08b5834386d861110869e90237174b8969f3a0)
@@ -1,527 +1,567 @@
-<%@ page contentType="text/html; charset=utf-8" language="java"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<c:set var="hasQuestions" value="${questionCount > 0}" />
-
-<!DOCTYPE html>
-<lams:html>
-<lams:head>
-	<title>Collection</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	
-	<lams:css/>
-	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
-	<link type="text/css" href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable.css"> 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable-lams.css"> 
-	<style>
-		#edit-collection-button {
-			float: right;
-		}
-		
-		.row {
-			margin-top: 10px;
-		}
-				
-		.middle-cell {
-			padding-top: 6px;
-			display: inline-block;
-		}
-
-		.header-column {
-			font-weight: bold;
-		}
-
-		.grid-question-count {
-			margin-left: 10px;
-		}
-		
-		.grid-collection-private {
-			color: red !important;
-			font-size: smaller;
-		}
-		
-		#grid-question-create {
-			display: inline-block;
-			float: right;
-			margin-right: 50px;
-		}
-		
-		#collection-name-row {
-			min-height: 20px; 
-			margin-top: 20px;
-		}
-		
-		#collection-name:hover+span+i {
-			visibility:visible
-		}
-		#collection-name+span+i {
-			visibility:hidden
-		}
-		
-		a.thickbox {
-			color: black;
-			padding-left: 8px;
-		}
-		
-		select {
-			height: auto !important;
-			width: auto !important;
-		}
-	</style>
-	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/x-editable.js"></script>
-	<script type="text/javascript">
-		$(document).ready(function(){
-			var collectionGrid = $('#collection-grid'),	
-				isPublicCollection = ${empty collection.userId};
-			
-			collectionGrid.jqGrid({
-				guiStyle: "bootstrap",
-				iconSet: 'fontAwesome',
-				caption: "Questions",
-			    datatype: "xml",
-			    url: "<lams:LAMSURL />qb/collection/getCollectionGridData.do?showUsage=true&collectionUid=${collection.uid}",
-			    height: "100%",
-			    autowidth:true,
-				shrinkToFit: true,
-				viewrecords: true,
-			    cellEdit: false,
-			    cmTemplate: { title: false, search: false },
-			    sortorder: "asc", 
-			    sortname: "name", 
-			    pager: true,
-			    rowList:[10,20,30,40,50,100],
-			    rowNum: 10,
-			    viewrecords: true,
-			    recordpos: "left",
-			    hidegrid: false,
-			    colNames:[
-			    	"ID",
-			    	"Name",
-			    	"questionType",
-			    	"questionVersion",
-			    	"Used in<br>lessons",
-			    	"Actions",
-			    	"hasVersions"
-			    ],
-			    colModel:[
-			    	{name:'id', index:'uid', sortable:true, hidden:false, width: 10},
-			    	{name:'name', index:'name', sortable:true, search:true, autoencode:true, formatter: questionNameFormatter},
-			    	{name:'questionType', index:'questionType', width:0, hidden: true},
-			    	{name:'questionVersion', index:'questionVersion', width:0, hidden: true},
-			    	{name: 'usage', index: 'usage', sortable:false, width: 10, align: "center"},
-			      	// formatter gets just question uid and creates a button
-			    	{name:'actions', index:'actions', classes: "stats-cell", sortable:false, width: 13, align: "center", formatter: actionsFormatter},
-					{name:'hasVersions', index:'hasVersions', width:0, hidden: true}
-			    ],
-				beforeSelectRow: function(rowid, e) {
-					// do not select rows at all
-				    return false;
-				},
-				loadComplete: function(data) {
-					//init thickbox
-					tb_init('a.thickbox');
-			    },
-			    loadError: function(xhr,st,err) {
-			    	collectionGrid.clearGridData();
-				   	alert("Error!");
-			    },
-				subGrid : true,
-				subGridOptions: {
-				    hasSubgrid: function (options) {
-				        return options.data.hasVersions == 'true';
-				    }
-				 },
-				subGridRowExpanded: function(subgrid_id, row_id) {
-				    var subgrid_table_id = subgrid_id + "_t",
-				   	    rowData = jQuery("#" + subgrid_id.substring(0, subgrid_id.lastIndexOf('_'))).getRowData(row_id),
-				   	    questionId = rowData["id"].split("_")[0];
-					jQuery("#"+subgrid_id).html("<table id='"+subgrid_table_id+"' class='scroll archive'></table><div id='"+subgrid_table_id+"_pager' class='scroll' ></div>");
-					jQuery("#"+subgrid_table_id).jqGrid({
-							 guiStyle: "bootstrap",
-							 iconSet: 'fontAwesome',
-							 autoencode:false,
-							 autowidth: true,
-						     datatype: "xml",
-						     url: "<lams:LAMSURL />qb/collection/getQuestionVersionGridData.do?qbQuestionId=" + questionId,
-						     height: "100%",
-						     cmTemplate: { title: false },
-						     cellEdit:false,
-						     pager: false,
-						     colNames: [
-						    	"ID",
-						    	"Name",
-						    	"questionType",
-						    	"questionVersion",
-						    	"Used in<br>lessons",
-						    	"Actions"
-						     ],
-						     colModel: [
-						    	{name:'id', index:'uid', sortable:false, hidden:true, width: 10},
-						    	{name:'name', index:'name', sortable:false, search:false, autoencode:true, formatter: questionNameFormatter},
-						    	{name:'questionType', index:'questionType', width:0, hidden: true},
-						    	{name:'questionVersion', index:'questionVersion', width:0, hidden: true},
-						    	{name: 'usage', index: 'usage', sortable:false, width: 9, align: "center"},
-						      	// formatter gets just question uid and creates a button
-						    	{name:'actions', index:'actions', classes: "stats-cell", sortable:false, width: 12, align: "center", formatter: actionsFormatter}
-						     ],
-						     loadError: function(xhr,st,err) {
-						    	jQuery("#"+subgrid_table_id).clearGridData();
-						    	alert("Error!");
-						     }
-					  	});
-					}
-			}).jqGrid('filterToolbar');
-
-			if (!isPublicCollection) {
-				//turn to inline mode for x-editable.js
-				$.fn.editable.defaults.mode = 'inline';
-				//enable renaming of lesson title  
-				$('#collection-name').editable({
-				    type: 'text',
-				    pk: ${collection.uid},
-				    url: "<lams:LAMSURL />qb/collection/changeCollectionName.do",
-				    validate: function(value) {
-					    //close editing area on validation failure
-			            if (!value.trim()) {
-			                $('.editable-open').editableContainer('hide', 'cancel');
-			                return 'Can not be empty!';
-			            }
-			        },
-				    //assume server response: 200 Ok {status: 'error', msg: 'field cannot be empty!'}
-				    success: function(response, newValue) {
-						if (response.created == 'false') {
-							alert('Collection with such name already exists');
-						}
-				    }
-			    //hide and show pencil on showing and hiding editing widget
-				}).on('shown', function(e, editable) {
-					$(this).nextAll('i.fa-pencil').hide();
-				}).on('hidden', function(e, reason) {
-					$(this).nextAll('i.fa-pencil').show();
-				});
-			}
-		});
-		
-		// auxiliary formatter for jqGrid's question statistics column
-		function actionsFormatter(cellvalue){
-			var cellhtml = "<i class='fa fa-bar-chart' onClick='javascript:window.open(\"<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=" + cellvalue 
-					+ "\", \"_blank\")' title='Show stats'></i>";
-
-			cellhtml += "<a  title='<fmt:message key='label.edit' />' href='<c:url value='/qb/edit/editQuestion.do'/>?qbQuestionUid=" 
-						+ cellvalue + "&collectionUid=${collection.uid}&KeepThis=true&TB_iframe=true' class='thickbox'>"; 
-			cellhtml += 	"<i class='fa fa-pencil'></i>";
-			cellhtml += "</a>";
-
-			return cellhtml;
-		}
-		
-		//auxiliary formatter for jqGrid's question column
-		function questionNameFormatter (cellvalue, options, rowObject) {
-	       	var questionTypeInt = rowObject[2].textContent;
-	       	var questionType;
-	       	switch (questionTypeInt) {
-	        case '1':
-	        	questionType = "<fmt:message key="label.question.type.multiple.choice" />";
-	          	break;
-	        case '2':
-	        	questionType = "<fmt:message key="label.question.type.matching.pairs" />";
-	          	break;
-	        case '3':
-	        	questionType = "<fmt:message key="label.question.type.short.answer" />";
-	          	break;
-	        case '4':
-	        	questionType = "<fmt:message key="label.question.type.numerical" />";
-	          	break;
-	        case '5':
-	        	questionType = "<fmt:message key="label.question.type.true.false" />";
-	          	break;
-	        case '6':
-	        	questionType = "<fmt:message key="label.question.type.essay" />";
-	          	break;
-	        case '7':
-	        	questionType = "<fmt:message key="label.question.type.ordering" />";
-	          	break;
-	        case '8':
-	        	questionType = "<fmt:message key="label.question.type.mark.hedging" />";
-	          	break;
-	      	}
-
-	       	var questionVersion = rowObject[3].textContent;
-
-	       	var text = cellvalue ? "<a target='_blank' title='Show stats' href='<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=" 
-	       						  + options.rowId + "'>" + cellvalue  + "</a>" : "";
-	        text += "<span class='pull-right alert-info btn-xs loffset5'>";
-	       	text += "v. " + questionVersion;
-	        text += "</span>";
-	        if (questionType) {
-		       	text += "<span class='pull-right alert-info btn-xs'>";
-		       	text += questionType;
-		        text += "</span>";
-	        }
-	        	
-			return text;
-		}
-		
-		// remove a collection
-		function removeCollection() {
-			if (confirm('Are you sure you want to remove "${collection.name}" collection?')) {
-				$.ajax({
-					'url'  : '<lams:LAMSURL />qb/collection/removeCollection.do',
-					'type' : 'POST',
-					'dataType' : 'text',
-					'data' : {
-						'collectionUid' : ${collection.uid}
-					},
-					'cache' : false
-				}).done(function(){
-					document.location.href = '<lams:LAMSURL />qb/collection/show.do';
-				});
-			}
-		}
-		
-		// share a collection with authors of an organisation
-		function shareCollection(organisationId) {
-			var grid =  $('#collection-grid');
-			
-			$.ajax({
-				'url'  : '<lams:LAMSURL />qb/collection/shareCollection.do',
-				'type' : 'POST',
-				'dataType' : 'text',
-				'data' : {
-					'collectionUid' : ${collection.uid},
-					'organisationId': organisationId
-				},
-				'cache' : false
-			}).done(function(){
-				document.location.reload();
-			});
-		}
-		
-		// stop sharing a collection with authors of an organisation
-		function unshareCollection(organisationId) {
-			var grid =  $('#collection-grid');
-			
-			$.ajax({
-				'url'  : '<lams:LAMSURL />qb/collection/unshareCollection.do',
-				'type' : 'POST',
-				'dataType' : 'text',
-				'data' : {
-					'collectionUid' : ${collection.uid},
-					'organisationId': organisationId
-				},
-				'cache' : false
-			}).done(function(){
-				document.location.reload();
-			});
-		}
-
-	    function importQTI(){
-	    	window.open('<lams:LAMSURL/>questions/questionFile.jsp',
-				'QuestionFile','width=500,height=240,scrollbars=yes');
-	    }
-		
-	    function saveQTI(formHTML, formName) {
-	    	var form = $($.parseHTML(formHTML));
-			$.ajax({
-				type: "POST",
-				url: '<c:url value="/imsqti/saveQTI.do" />?contentFolderID=${contentFolderID}&collectionUid=${collection.uid}',
-				data: form.serializeArray(),
-				success: function() {
-					location.reload();
-				}
-			});
-	    }
-
-	    function exportQTI(){
-	    	var frame = document.getElementById("downloadFileDummyIframe");
-	    	frame.src = '<c:url value="/imsqti/exportCollectionAsQTI.do" />?collectionUid=${collection.uid}';
-	    }
-		
-		function exportQuestionsXml(){   
-		    var reqIDVar = new Date();
-			location.href="<c:url value='/xmlQuestions/exportQuestionsXml.do'/>?collectionUid=${collection.uid}&reqID="+reqIDVar.getTime();
-		}
-		
-		//create proper href for "Create question" button
-		function initLinkHref() {
-			var questionType = document.getElementById("question-type").selectedIndex + 1;
-			$("#create-question-href").attr("href", 
-					"<c:url value='/qb/edit/newQuestionInit.do'/>?questionType=" + questionType 
-					+ "&collectionUid=${collection.uid}" 
-					+ "&KeepThis=true&TB_iframe=true&modal=true");
-		};
-		
-	    //this method gets invoked after question has been edited and saved
-		function refreshThickbox(){
-			location.reload();
-		};
-	</script>
-</lams:head>
-<body class="stripes">
-<lams:Page title="Collection" type="admin">
-	
-	<div>
-		<button class="btn btn-default btn-sm" onClick="javascript:document.location.href='<lams:LAMSURL />qb/collection/show.do'">
-			<i class="fa fa-angle-double-left"></i>
-			Collection management
-		</button>
-	</div>
-	
-	<div id="collection-name-row" class="row h4">
-		
-		<div class="col-xs-12 col-sm-8">
-			<span id="collection-name">
-				<strong>
-					<c:out value="${collection.name}" />
-				</strong>
-			</span>
-			<c:if test="${not empty collection.userId}">
-				<span>&nbsp;</span><i class='fa fa-sm fa-pencil'></i>
-			</c:if>
-			
-			<c:if test="${collection.personal}">
-				<span class="grid-collection-private small">
-					<i class="fa fa-lock"></i> Private collection
-				</span>
-			</c:if>
-		</div>
-		
-		<div class=" col-xs-12 col-sm-4">
-
-			<%-- Do not display button for public and private collections --%>
-			<c:if test="${not empty collection.userId and not collection.personal}">
-				<div class="btn-group-xs pull-right loffset10">
-					<c:if test="${not hasQuestions}">
-						<button class="btn btn-default" onClick="javascript:removeCollection()" title="Remove collection">
-							<i class="fa fa-trash"></i>
-							Remove collection
-						</button>
-					</c:if>
-				</div>
-			</c:if>
-		
-			<div class="btn-group btn-group-xs pull-right loffset10" role="group">
-				<a class="btn btn-default btn-xs disabled" aria-disabled="true">XML</a>
-			
-				<a class="btn btn-default btn-xs loffset5 thickbox" title="<fmt:message key="label.import.xml" />"
-					href="<c:url value='/xmlQuestions/initImportQuestionsXml.do'/>?collectionUid=${collection.uid}&KeepThis=true&TB_iframe=true&modal=true" >  
-					<i class="fa fa-upload"></i>
-				</a>
-				
-				<c:if test="${isQtiExportEnabled && hasQuestions}">
-					<a onclick="javascript:exportQuestionsXml();" class="btn btn-default btn-xs" title="<fmt:message key="label.export.xml" />">  
-						<i class="fa fa-download"></i>
-					</a>
-				</c:if>
-			</div>
-			
-			<div class="btn-group btn-group-xs loffset10 pull-right" role="group">
-				<a class="btn btn-default btn-xs disabled" aria-disabled="true">QTI</a>
-			
-				<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default" title="<fmt:message key='label.import.qti'/>">
-					<i class="fa fa-upload"></i>
-				</a>
-				
-				<c:if test="${isQtiExportEnabled && hasQuestions}">
-					<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default" title="<fmt:message key='label.export.qti'/>">
-						<i class="fa fa-download"></i>
-					</a>
-				</c:if>
-			</div>
-				
-			<div class="btn-group-xs pull-right" style="display: flex;">
-				<select id="question-type" class="form-control btn-xs">
-					<option selected="selected"><fmt:message key="label.question.type.multiple.choice" /></option>
-					<option><fmt:message key="label.question.type.matching.pairs" /></option>
-					<option><fmt:message key="label.question.type.short.answer" /></option>
-					<option><fmt:message key="label.question.type.numerical" /></option>
-					<option><fmt:message key="label.question.type.true.false" /></option>
-					<option><fmt:message key="label.question.type.essay" /></option>
-					<option><fmt:message key="label.question.type.ordering" /></option>
-					<option><fmt:message key="label.question.type.mark.hedging" /></option>
-				</select>&nbsp;
-						
-				<a onclick="initLinkHref();return false;" href="" class="btn btn-default thickbox" id="create-question-href">  
-					<i class="fa fa-plus-circle" aria-hidden="true" title="<fmt:message key="label.create.question" />"></i>
-				</a>
-			</div>
-			
-		</div>
-	</div>
-				
-	<c:choose>
-		<c:when test="${hasQuestions}">			
-			<%-- jqGrid placeholder with some useful attributes --%>
-			<div class="voffset20" >
-				<table id="collection-grid"></table>
-			</div>
-		</c:when>
-		<c:otherwise>
-			<div class="alert alert-warning">
-				There are no questions in this collection
-			</div>
-		</c:otherwise>
-	</c:choose>
-
-	<%-- Do not display links for collection manipulation for public and private collections --%>
-	<c:if test="${not empty collection.userId and not collection.personal
-		and (not empty collection.organisations or not empty availableOrganisations)}">
-		<div class="panel panel-default voffset20">
-			<div class="panel-heading">
-				Share collection with organisations
-			</div>
-			<div class="panel-body">
-				<table class="table table-striped table-condensed table-responsive" style="max-width: 400px;">
-					<tbody>
-					
-						<%-- Already shared organisations--%>
-						<c:forEach var="organisation" items="${collection.organisations}">
-							<tr  class="info">
-								<td>
-									<c:out value="${organisation.name}" />&nbsp;
-									<span class="label label-primary">Shared</span>
-								</td>
-								<td width="30px;">
-									<button class="btn btn-default btn-xs" onClick="javascript:unshareCollection(${organisation.organisationId})">
-										Unshare
-									</button>
-								</td>
-							</tr>
-						</c:forEach>
-							
-						<%-- Not yet shared ones --%>
-						<c:forEach var="organisation" items="${availableOrganisations}">
-							<tr>
-								<td>
-									<c:out value="${organisation.name}" />
-								</td>
-								<td width="30px;" style="text-align: center;">
-									<button class="btn btn-default btn-xs" onClick="javascript:shareCollection(${organisation.organisationId})">
-										Share
-									</button>
-								</td>
-							</tr>						
-						</c:forEach>
-					</tbody>
-				</table>
-			
-			</div>
-		</div>
-	</c:if>
-
-	
-	<!-- Dummy div for question save to work properly -->
-	<div id="itemArea" class="hidden"></div>
-	<!-- Dummy iframe for exporting QTI packages -->
-	<iframe id="downloadFileDummyIframe" style="display: none;"></iframe>
-</lams:Page>
-</body>
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<c:set var="hasQuestions" value="${questionCount > 0}" />
+
+<!DOCTYPE html>
+<lams:html>
+<lams:head>
+	<title>Collection</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	
+	<lams:css/>
+	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
+	<link type="text/css" href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable.css"> 
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable-lams.css"> 
+	<style>
+		#edit-collection-button {
+			float: right;
+		}
+		
+		.row {
+			margin-top: 10px;
+		}
+				
+		.middle-cell {
+			padding-top: 6px;
+			display: inline-block;
+		}
+
+		.header-column {
+			font-weight: bold;
+		}
+
+		.grid-question-count {
+			margin-left: 10px;
+		}
+		
+		.grid-collection-private {
+			color: red !important;
+			font-size: smaller;
+		}
+		
+		#grid-question-create {
+			display: inline-block;
+			float: right;
+			margin-right: 50px;
+		}
+		
+		#collection-name-row {
+			min-height: 20px; 
+			margin-top: 20px;
+		}
+		
+		#collection-name:hover+span+i {
+			visibility:visible
+		}
+		#collection-name+span+i {
+			visibility:hidden
+		}
+		
+		a.thickbox {
+			color: black;
+			padding-left: 8px;
+		}
+		
+		select {
+			height: auto !important;
+			width: auto !important;
+		}
+		
+		.all-learning-outcomes {
+			display: none;
+		}
+		
+		.all-learning-outcomes-show {
+			cursor: pointer;
+		}
+	</style>
+	
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/x-editable.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function(){
+			var collectionGrid = $('#collection-grid'),	
+				isPublicCollection = ${empty collection.userId};
+			
+			collectionGrid.jqGrid({
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
+				caption: "Questions",
+			    datatype: "xml",
+			    url: "<lams:LAMSURL />qb/collection/getCollectionGridData.do?view=single&collectionUid=${collection.uid}",
+			    height: "100%",
+			    autowidth:true,
+				shrinkToFit: true,
+				viewrecords: true,
+			    cellEdit: false,
+			    cmTemplate: { title: false, search: false },
+			    sortorder: "asc", 
+			    sortname: "name", 
+			    pager: true,
+			    rowList:[10,20,30,40,50,100],
+			    rowNum: 10,
+			    viewrecords: true,
+			    recordpos: "left",
+			    hidegrid: false,
+			    colNames:[
+			    	"ID",
+			    	"Name",
+			    	"questionType",
+			    	"questionVersion",
+			    	"Learning Outcomes",
+			    	"Used in<br>lessons",
+			    	"Actions",
+			    	"hasVersions"
+			    ],
+			    colModel:[
+			    	{name:'id', index:'uid', sortable:true, hidden:false, width: 10},
+			    	{name:'name', index:'name', sortable:true, search:true, autoencode:true, formatter: questionNameFormatter},
+			    	{name:'questionType', index:'questionType', width:0, hidden: true},
+			    	{name:'questionVersion', index:'questionVersion', width:0, hidden: true},
+			    	{name: 'learningOutcomes', index: 'learningOutcomes', sortable:true, search:true, autoencode: true, width: 25, formatter: learningOutcomeFormatter},
+			    	{name: 'usage', index: 'usage', sortable:false, width: 10, align: "center"},
+			      	// formatter gets just question uid and creates a button
+			    	{name:'actions', index:'actions', classes: "stats-cell", sortable:false, width: 13, align: "center", formatter: actionsFormatter},
+					{name:'hasVersions', index:'hasVersions', width:0, hidden: true}
+			    ],
+				beforeSelectRow: function(rowid, e) {
+					// do not select rows at all
+				    return false;
+				},
+				loadComplete: function(data) {
+					//init thickbox
+					tb_init('a.thickbox');
+			    },
+			    loadError: function(xhr,st,err) {
+			    	collectionGrid.clearGridData();
+				   	alert("Error!");
+			    },
+				subGrid : true,
+				subGridOptions: {
+				    hasSubgrid: function (options) {
+				        return options.data.hasVersions == 'true';
+				    }
+				 },
+				subGridRowExpanded: function(subgrid_id, row_id) {
+				    var subgrid_table_id = subgrid_id + "_t",
+				   	    rowData = jQuery("#" + subgrid_id.substring(0, subgrid_id.lastIndexOf('_'))).getRowData(row_id),
+				   	    questionId = rowData["id"].split("_")[0];
+					jQuery("#"+subgrid_id).html("<table id='"+subgrid_table_id+"' class='scroll archive'></table><div id='"+subgrid_table_id+"_pager' class='scroll' ></div>");
+					jQuery("#"+subgrid_table_id).jqGrid({
+							 guiStyle: "bootstrap",
+							 iconSet: 'fontAwesome',
+							 autoencode:false,
+							 autowidth: true,
+						     datatype: "xml",
+						     url: "<lams:LAMSURL />qb/collection/getQuestionVersionGridData.do?view=version&qbQuestionId=" + questionId,
+						     height: "100%",
+						     cmTemplate: { title: false },
+						     cellEdit:false,
+						     pager: false,
+						     colNames: [
+						    	"ID",
+						    	"Name",
+						    	"questionType",
+						    	"questionVersion",
+						    	"Learning Outcomes",
+						    	"Used in<br>lessons",
+						    	"Actions"
+						     ],
+						     colModel: [
+						    	{name:'id', index:'question_id', sortable:false, hidden:true, width: 10},
+						    	{name:'name', index:'name', sortable:false, search:false, autoencode:true, formatter: questionNameFormatter},
+						    	{name:'questionType', index:'questionType', width:0, hidden: true},
+						    	{name:'questionVersion', index:'questionVersion', width:0, hidden: true},
+						    	{name: 'learningOutcomes', index: 'learningOutcomes', width:0, hidden: true},
+						    	{name: 'usage', index: 'usage', sortable:false, width: 9, align: "center"},
+						      	// formatter gets just question uid and creates a button
+						    	{name:'actions', index:'actions', classes: "stats-cell", sortable:false, width: 12, align: "center", formatter: actionsFormatter}
+						     ],
+						     loadError: function(xhr,st,err) {
+						    	jQuery("#"+subgrid_table_id).clearGridData();
+						    	alert("Error!");
+						     }
+					  	});
+					}
+			}).jqGrid('filterToolbar');
+
+			if (!isPublicCollection) {
+				//turn to inline mode for x-editable.js
+				$.fn.editable.defaults.mode = 'inline';
+				//enable renaming of lesson title  
+				$('#collection-name').editable({
+				    type: 'text',
+				    pk: ${collection.uid},
+				    url: "<lams:LAMSURL />qb/collection/changeCollectionName.do",
+				    validate: function(value) {
+					    //close editing area on validation failure
+			            if (!value.trim()) {
+			                $('.editable-open').editableContainer('hide', 'cancel');
+			                return 'Can not be empty!';
+			            }
+			        },
+				    //assume server response: 200 Ok {status: 'error', msg: 'field cannot be empty!'}
+				    success: function(response, newValue) {
+						if (response.created == 'false') {
+							alert('Collection with such name already exists');
+						}
+				    }
+			    //hide and show pencil on showing and hiding editing widget
+				}).on('shown', function(e, editable) {
+					$(this).nextAll('i.fa-pencil').hide();
+				}).on('hidden', function(e, reason) {
+					$(this).nextAll('i.fa-pencil').show();
+				});
+			}
+		});
+		
+		function learningOutcomeFormatter(cellvalue) {
+			if (!cellvalue) {
+				return '';
+			}
+			
+			var outcomes = cellvalue.split('<br>'),
+				cellhtml = '',
+				firstOutcome = null;
+			outcomes.forEach(function(outcome){
+				cellhtml += '<span class="alert-info btn-xs">' + outcome + '</span><br>';
+				if (!firstOutcome) {
+					firstOutcome = cellhtml;
+				}
+			});
+			
+			// if there is only one outcome, just show it
+			// if there is more, show the first one and a button to show all
+			return outcomes.length === 1 ? cellhtml :
+				   	firstOutcome + '<a class="all-learning-outcomes-show" onClick="javascript:showLearningOutcomes(this)">'
+					+ '(show all)</a><div class="all-learning-outcomes">' + cellhtml + '</div>';
+		}
+		
+		function showLearningOutcomes(button) {
+			var cell = $(button).closest('td'),
+				fullText = $('.all-learning-outcomes', cell).html();
+			cell.html(fullText);
+		}
+		
+		// auxiliary formatter for jqGrid's question statistics column
+		function actionsFormatter(cellvalue){
+			var cellhtml = "<i class='fa fa-bar-chart' onClick='javascript:window.open(\"<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=" + cellvalue 
+					+ "\", \"_blank\")' title='Show stats'></i>";
+
+			cellhtml += "<a  title='<fmt:message key='label.edit' />' href='<c:url value='/qb/edit/editQuestion.do'/>?qbQuestionUid=" 
+						+ cellvalue + "&collectionUid=${collection.uid}&KeepThis=true&TB_iframe=true' class='thickbox'>"; 
+			cellhtml += 	"<i class='fa fa-pencil'></i>";
+			cellhtml += "</a>";
+
+			return cellhtml;
+		}
+		
+		//auxiliary formatter for jqGrid's question column
+		function questionNameFormatter (cellvalue, options, rowObject) {
+	       	var questionTypeInt = rowObject[2].textContent;
+	       	var questionType;
+	       	switch (questionTypeInt) {
+	        case '1':
+	        	questionType = "<fmt:message key="label.question.type.multiple.choice" />";
+	          	break;
+	        case '2':
+	        	questionType = "<fmt:message key="label.question.type.matching.pairs" />";
+	          	break;
+	        case '3':
+	        	questionType = "<fmt:message key="label.question.type.short.answer" />";
+	          	break;
+	        case '4':
+	        	questionType = "<fmt:message key="label.question.type.numerical" />";
+	          	break;
+	        case '5':
+	        	questionType = "<fmt:message key="label.question.type.true.false" />";
+	          	break;
+	        case '6':
+	        	questionType = "<fmt:message key="label.question.type.essay" />";
+	          	break;
+	        case '7':
+	        	questionType = "<fmt:message key="label.question.type.ordering" />";
+	          	break;
+	        case '8':
+	        	questionType = "<fmt:message key="label.question.type.mark.hedging" />";
+	          	break;
+	      	}
+
+	       	var questionVersion = rowObject[3].textContent;
+
+	       	var text = cellvalue ? "<a target='_blank' title='Show stats' href='<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=" 
+	       						  + options.rowId + "'>" + cellvalue  + "</a>" : "";
+	        text += "<span class='pull-right alert-info btn-xs loffset5'>";
+	       	text += "v. " + questionVersion;
+	        text += "</span>";
+	        if (questionType) {
+		       	text += "<span class='pull-right alert-info btn-xs'>";
+		       	text += questionType;
+		        text += "</span>";
+	        }
+	        	
+			return text;
+		}
+		
+		// remove a collection
+		function removeCollection() {
+			if (confirm('Are you sure you want to remove "${collection.name}" collection?')) {
+				$.ajax({
+					'url'  : '<lams:LAMSURL />qb/collection/removeCollection.do',
+					'type' : 'POST',
+					'dataType' : 'text',
+					'data' : {
+						'collectionUid' : ${collection.uid}
+					},
+					'cache' : false
+				}).done(function(){
+					document.location.href = '<lams:LAMSURL />qb/collection/show.do';
+				});
+			}
+		}
+		
+		// share a collection with authors of an organisation
+		function shareCollection(organisationId) {
+			var grid =  $('#collection-grid');
+			
+			$.ajax({
+				'url'  : '<lams:LAMSURL />qb/collection/shareCollection.do',
+				'type' : 'POST',
+				'dataType' : 'text',
+				'data' : {
+					'collectionUid' : ${collection.uid},
+					'organisationId': organisationId
+				},
+				'cache' : false
+			}).done(function(){
+				document.location.reload();
+			});
+		}
+		
+		// stop sharing a collection with authors of an organisation
+		function unshareCollection(organisationId) {
+			var grid =  $('#collection-grid');
+			
+			$.ajax({
+				'url'  : '<lams:LAMSURL />qb/collection/unshareCollection.do',
+				'type' : 'POST',
+				'dataType' : 'text',
+				'data' : {
+					'collectionUid' : ${collection.uid},
+					'organisationId': organisationId
+				},
+				'cache' : false
+			}).done(function(){
+				document.location.reload();
+			});
+		}
+
+	    function importQTI(){
+	    	window.open('<lams:LAMSURL/>questions/questionFile.jsp',
+				'QuestionFile','width=500,height=240,scrollbars=yes');
+	    }
+		
+	    function saveQTI(formHTML, formName) {
+	    	var form = $($.parseHTML(formHTML));
+			$.ajax({
+				type: "POST",
+				url: '<c:url value="/imsqti/saveQTI.do" />?contentFolderID=${contentFolderID}&collectionUid=${collection.uid}',
+				data: form.serializeArray(),
+				success: function() {
+					location.reload();
+				}
+			});
+	    }
+
+	    function exportQTI(){
+	    	var frame = document.getElementById("downloadFileDummyIframe");
+	    	frame.src = '<c:url value="/imsqti/exportCollectionAsQTI.do" />?collectionUid=${collection.uid}';
+	    }
+		
+		function exportQuestionsXml(){   
+		    var reqIDVar = new Date();
+			location.href="<c:url value='/xmlQuestions/exportQuestionsXml.do'/>?collectionUid=${collection.uid}&reqID="+reqIDVar.getTime();
+		}
+		
+		//create proper href for "Create question" button
+		function initLinkHref() {
+			var questionType = document.getElementById("question-type").selectedIndex + 1;
+			$("#create-question-href").attr("href", 
+					"<c:url value='/qb/edit/newQuestionInit.do'/>?questionType=" + questionType 
+					+ "&collectionUid=${collection.uid}" 
+					+ "&KeepThis=true&TB_iframe=true&modal=true");
+		};
+		
+	    //this method gets invoked after question has been edited and saved
+		function refreshThickbox(){
+			location.reload();
+		};
+	</script>
+</lams:head>
+<body class="stripes">
+<lams:Page title="Collection" type="admin">
+	
+	<div>
+		<button class="btn btn-default btn-sm" onClick="javascript:document.location.href='<lams:LAMSURL />qb/collection/show.do'">
+			<i class="fa fa-angle-double-left"></i>
+			Collection management
+		</button>
+	</div>
+	
+	<div id="collection-name-row" class="row h4">
+		
+		<div class="col-xs-12 col-sm-8">
+			<span id="collection-name">
+				<strong>
+					<c:out value="${collection.name}" />
+				</strong>
+			</span>
+			<c:if test="${not empty collection.userId}">
+				<span>&nbsp;</span><i class='fa fa-sm fa-pencil'></i>
+			</c:if>
+			
+			<c:if test="${collection.personal}">
+				<span class="grid-collection-private small">
+					<i class="fa fa-lock"></i> Private collection
+				</span>
+			</c:if>
+		</div>
+		
+		<div class=" col-xs-12 col-sm-4">
+
+			<%-- Do not display button for public and private collections --%>
+			<c:if test="${not empty collection.userId and not collection.personal}">
+				<div class="btn-group-xs pull-right loffset10">
+					<c:if test="${not hasQuestions}">
+						<button class="btn btn-default" onClick="javascript:removeCollection()" title="Remove collection">
+							<i class="fa fa-trash"></i>
+							Remove collection
+						</button>
+					</c:if>
+				</div>
+			</c:if>
+		
+			<div class="btn-group btn-group-xs pull-right loffset10" role="group">
+				<a class="btn btn-default btn-xs disabled" aria-disabled="true">XML</a>
+			
+				<a class="btn btn-default btn-xs loffset5 thickbox" title="<fmt:message key="label.import.xml" />"
+					href="<c:url value='/xmlQuestions/initImportQuestionsXml.do'/>?collectionUid=${collection.uid}&KeepThis=true&TB_iframe=true&modal=true" >  
+					<i class="fa fa-upload"></i>
+				</a>
+				
+				<c:if test="${isQtiExportEnabled && hasQuestions}">
+					<a onclick="javascript:exportQuestionsXml();" class="btn btn-default btn-xs" title="<fmt:message key="label.export.xml" />">  
+						<i class="fa fa-download"></i>
+					</a>
+				</c:if>
+			</div>
+			
+			<div class="btn-group btn-group-xs loffset10 pull-right" role="group">
+				<a class="btn btn-default btn-xs disabled" aria-disabled="true">QTI</a>
+			
+				<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default" title="<fmt:message key='label.import.qti'/>">
+					<i class="fa fa-upload"></i>
+				</a>
+				
+				<c:if test="${isQtiExportEnabled && hasQuestions}">
+					<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default" title="<fmt:message key='label.export.qti'/>">
+						<i class="fa fa-download"></i>
+					</a>
+				</c:if>
+			</div>
+				
+			<div class="btn-group-xs pull-right" style="display: flex;">
+				<select id="question-type" class="form-control btn-xs">
+					<option selected="selected"><fmt:message key="label.question.type.multiple.choice" /></option>
+					<option><fmt:message key="label.question.type.matching.pairs" /></option>
+					<option><fmt:message key="label.question.type.short.answer" /></option>
+					<option><fmt:message key="label.question.type.numerical" /></option>
+					<option><fmt:message key="label.question.type.true.false" /></option>
+					<option><fmt:message key="label.question.type.essay" /></option>
+					<option><fmt:message key="label.question.type.ordering" /></option>
+					<option><fmt:message key="label.question.type.mark.hedging" /></option>
+				</select>&nbsp;
+						
+				<a onclick="initLinkHref();return false;" href="" class="btn btn-default thickbox" id="create-question-href">  
+					<i class="fa fa-plus-circle" aria-hidden="true" title="<fmt:message key="label.create.question" />"></i>
+				</a>
+			</div>
+			
+		</div>
+	</div>
+				
+	<c:choose>
+		<c:when test="${hasQuestions}">			
+			<%-- jqGrid placeholder with some useful attributes --%>
+			<div class="voffset20" >
+				<table id="collection-grid"></table>
+			</div>
+		</c:when>
+		<c:otherwise>
+			<div class="alert alert-warning">
+				There are no questions in this collection
+			</div>
+		</c:otherwise>
+	</c:choose>
+
+	<%-- Do not display links for collection manipulation for public and private collections --%>
+	<c:if test="${not empty collection.userId and not collection.personal
+		and (not empty collection.organisations or not empty availableOrganisations)}">
+		<div class="panel panel-default voffset20">
+			<div class="panel-heading">
+				Share collection with organisations
+			</div>
+			<div class="panel-body">
+				<table class="table table-striped table-condensed table-responsive" style="max-width: 400px;">
+					<tbody>
+					
+						<%-- Already shared organisations--%>
+						<c:forEach var="organisation" items="${collection.organisations}">
+							<tr  class="info">
+								<td>
+									<c:out value="${organisation.name}" />&nbsp;
+									<span class="label label-primary">Shared</span>
+								</td>
+								<td width="30px;">
+									<button class="btn btn-default btn-xs" onClick="javascript:unshareCollection(${organisation.organisationId})">
+										Unshare
+									</button>
+								</td>
+							</tr>
+						</c:forEach>
+							
+						<%-- Not yet shared ones --%>
+						<c:forEach var="organisation" items="${availableOrganisations}">
+							<tr>
+								<td>
+									<c:out value="${organisation.name}" />
+								</td>
+								<td width="30px;" style="text-align: center;">
+									<button class="btn btn-default btn-xs" onClick="javascript:shareCollection(${organisation.organisationId})">
+										Share
+									</button>
+								</td>
+							</tr>						
+						</c:forEach>
+					</tbody>
+				</table>
+			
+			</div>
+		</div>
+	</c:if>
+
+	
+	<!-- Dummy div for question save to work properly -->
+	<div id="itemArea" class="hidden"></div>
+	<!-- Dummy iframe for exporting QTI packages -->
+	<iframe id="downloadFileDummyIframe" style="display: none;"></iframe>
+</lams:Page>
+</body>
 </lams:html>
\ No newline at end of file
Index: lams_central/web/qb/collectionList.jsp
===================================================================
diff -u -re984933f19c9e4cfc051bcde963c81b412bceea3 -rce08b5834386d861110869e90237174b8969f3a0
--- lams_central/web/qb/collectionList.jsp	(.../collectionList.jsp)	(revision e984933f19c9e4cfc051bcde963c81b412bceea3)
+++ lams_central/web/qb/collectionList.jsp	(.../collectionList.jsp)	(revision ce08b5834386d861110869e90237174b8969f3a0)
@@ -1,180 +1,182 @@
-<%@ page contentType="text/html; charset=utf-8" language="java"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-
-<!DOCTYPE html>
-<lams:html>
-<lams:head>
-	<title>Collection management</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	
-	<lams:css/>
-	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
-	<style>
-		#add-collection-div {
-			height: 50px;
-		}
-		
-		#add-collection-button {
-			float: right;
-		}
-		
-		.ui-jqgrid-title {
-			display: inline-block;
-			width: 100%;
-			height: 25px;
-		}
-		
-		.edit-button {
-			position: absolute;
-			right: 50px;
-			font-size: 12px !important;
-		}
-				
-		.grid-question-count {
-			margin-left: 10px;
-		}
-		
-		.grid-collection-private {
-			margin-left: 10px;
-			color: red;
-			font-size: smaller;
-		}
-	</style>
-	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
-	<script type="text/javascript">
-		$(document).ready(function(){
-			
-			// create a grid for each collection
-			$('.collection-grid').each(function(){
-				var collectionGrid = $(this);
-				
-				collectionGrid.jqGrid({
-					guiStyle: "bootstrap",
-					iconSet: 'fontAwesome',
-					// data comes from data-collection-* attributes of <table> tag which is a base for the grid
-					caption: collectionGrid.data('collectionTitle'),
-				    datatype: "xml",
-				    url: "<lams:LAMSURL />qb/collection/getCollectionGridData.do?collectionUid=" + collectionGrid.data('collectionUid'),
-				    height: "100%",
-				    autowidth:true,
-					shrinkToFit: true,
-					viewrecords: true,
-				    cellEdit: false,
-				    cmTemplate: { title: false, search: false },
-				    sortorder: "asc", 
-				    sortname: "name", 
-				    pager: true,
-				    rowList:[10,20,30,40,50,100],
-				    rowNum: 10,
-				    colNames:[
-				    	"ID",
-				    	"Name",
-				    	"questionType",
-				    	"questionVersion",
-				    	// this column is hidden, so data coming from controller can be the same as for single collection view
-				    	"Used in # of lessons",
-				    	"Stats"
-				    ],
-				    colModel:[
-				    	{name:'id', index:'uid', sortable:true,  width: 10},
-				    	// formatter gets just question uid and creates a link
-				    	{name:'name', index:'name', sortable:true, search:true, autoencode:true, formatter: nameLinkFormatter},
-				    	{name:'questionType', index:'questionType', width:0, hidden: true},
-				   		{name:'questionVersion', index:'questionVersion', width:0, hidden: true},
-				    	{name: 'usage', index: 'usage', hidden: true},
-				    	// formatter gets just question uid and creates a button
-				    	{name:'stats', index:'stats', classes: "stats-cell", sortable:false, width: 10, align: "center", formatter: statsLinkFormatter}
-				    ],
-					beforeSelectRow: function(rowid, e) {
-						// do not select rows at all
-					    return false;
-					},
-				    loadError: function(xhr,st,err) {
-				    	collectionGrid.clearGridData();
-					   	alert("Error!");
-				    }
-				}).jqGrid('filterToolbar');
-			});
-		});
-		
-		// Creates a button to display question statistics
-		function statsLinkFormatter(cellvalue){
-			return "<i class='fa fa-bar-chart' onClick='javascript:window.open(\"<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=" + cellvalue 
-					+ "\", \"_blank\")' title='Show stats'></i>";
-		}
-		
-		// Creates a link to display question statistics
-		function nameLinkFormatter(cellValue, options) {
-			return cellValue ? "<a target='_blank' title='Show stats' href='<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=" + options.rowId + "'>"
-					+ cellValue  + "</a>" : "";
-		}
-		
-		// add a new collection
-		function addCollection() {
-			// get collection name from a pop up
-			var name = prompt("New collection name"),
-				lower = name.toLowerCase();
-			// check if a collection with same name already exists
-			$('.collection-grid').each(function(){
-				if ($(this).data('collectionName').trim().toLowerCase() == lower) {
-					alert('Collection with such name already exists');
-					name = null;
-					return false;
-				}
-			});
-			if (name) {
-				$.ajax({
-					'url'  : '<lams:LAMSURL />qb/collection/addCollection.do',
-					'type' : 'POST',
-					'dataType' : 'text',
-					'data' : {
-						'name' : name
-					},
-					'cache' : false
-				}).done(function(){
-					document.location.reload();
-				});
-			}
-		}
-	</script>
-</lams:head>
-<body class="stripes">
-<lams:Page title="Collection management" type="admin">
-	<%-- This option can be switched off in sysadmin --%>
-	<c:if test="${createCollectionAllowed}">
-		<div id="add-collection-div">
-			<button id="add-collection-button" class="btn btn-primary" onClick="javascript:addCollection()">Add collection</button>
-		</div>
-	</c:if>
-	
-	<c:forEach var="collection" items="${collections}">
-		<div class="panel-body">
-			<%-- Build collection title with its name, question count, optional "private" flag and edit button --%>
-			<c:set var="collectionTitle">
-				<a href="<lams:LAMSURL />qb/collection/showOne.do?collectionUid=${collection.uid}"><c:out value="${collection.name}" />
-					<span class="grid-question-count">(${questionCount[collection.uid]} questions)</span>
-					<c:if test="${collection.personal}">
-						<span class="grid-collection-private"><i class="fa fa-lock"></i> Private</span>
-					</c:if>
-				</a>
-				<button class="btn btn-primary btn-xs edit-button"
-						onClick="javascript:document.location.href=`<lams:LAMSURL />qb/collection/showOne.do?collectionUid=${collection.uid}`">
-					Edit
-				</button>
-			</c:set>
-				
-			<%-- jqGrid placeholder with some useful attributes --%>
-			<table class="collection-grid" data-collection-uid="${collection.uid}"
-			 	   data-collection-name='<c:out value="${collection.name}" />' data-collection-title='${collectionTitle}'>
-			</table>
-		</div>
-	</c:forEach>
-</lams:Page>
-</body>
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<!DOCTYPE html>
+<lams:html>
+<lams:head>
+	<title>Collection management</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	
+	<lams:css/>
+	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
+	<style>
+		#add-collection-div {
+			height: 50px;
+		}
+		
+		#add-collection-button {
+			float: right;
+		}
+		
+		.ui-jqgrid-title {
+			display: inline-block;
+			width: 100%;
+			height: 25px;
+		}
+		
+		.edit-button {
+			position: absolute;
+			right: 50px;
+			font-size: 12px !important;
+		}
+				
+		.grid-question-count {
+			margin-left: 10px;
+		}
+		
+		.grid-collection-private {
+			margin-left: 10px;
+			color: red;
+			font-size: smaller;
+		}
+	</style>
+	
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function(){
+			
+			// create a grid for each collection
+			$('.collection-grid').each(function(){
+				var collectionGrid = $(this);
+				
+				collectionGrid.jqGrid({
+					guiStyle: "bootstrap",
+					iconSet: 'fontAwesome',
+					// data comes from data-collection-* attributes of <table> tag which is a base for the grid
+					caption: collectionGrid.data('collectionTitle'),
+				    datatype: "xml",
+				    url: "<lams:LAMSURL />qb/collection/getCollectionGridData.do?view=list&collectionUid=" + collectionGrid.data('collectionUid'),
+				    height: "100%",
+				    autowidth:true,
+					shrinkToFit: true,
+					viewrecords: true,
+				    cellEdit: false,
+				    cmTemplate: { title: false, search: false },
+				    sortorder: "asc", 
+				    sortname: "name", 
+				    pager: true,
+				    rowList:[10,20,30,40,50,100],
+				    rowNum: 10,
+				    colNames:[
+				    	"ID",
+				    	"Name",
+				    	"questionType",
+				    	"questionVersion",
+				    	"Learning Outcomes",
+				    	// this column is hidden, so data coming from controller can be the same as for single collection view
+				    	"Used in # of lessons",
+				    	"Stats"
+				    ],
+				    colModel:[
+				    	{name:'id', index:'question_id', sortable:true,  width: 10},
+				    	// formatter gets just question uid and creates a link
+				    	{name:'name', index:'name', sortable:true, search:true, autoencode:true, formatter: nameLinkFormatter},
+				    	{name:'questionType', index:'questionType', width:0, hidden: true},
+				   		{name:'questionVersion', index:'questionVersion', width:0, hidden: true},
+				    	{name: 'learningOutcomes', index: 'learningOutcomes', width:0, hidden: true},
+				    	{name: 'usage', index: 'usage', hidden: true},
+				    	// formatter gets just question uid and creates a button
+				    	{name:'stats', index:'stats', classes: "stats-cell", sortable:false, width: 10, align: "center", formatter: statsLinkFormatter}
+				    ],
+					beforeSelectRow: function(rowid, e) {
+						// do not select rows at all
+					    return false;
+					},
+				    loadError: function(xhr,st,err) {
+				    	collectionGrid.clearGridData();
+					   	alert("Error!");
+				    }
+				}).jqGrid('filterToolbar');
+			});
+		});
+		
+		// Creates a button to display question statistics
+		function statsLinkFormatter(cellvalue){
+			return "<i class='fa fa-bar-chart' onClick='javascript:window.open(\"<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=" + cellvalue 
+					+ "\", \"_blank\")' title='Show stats'></i>";
+		}
+		
+		// Creates a link to display question statistics
+		function nameLinkFormatter(cellValue, options) {
+			return cellValue ? "<a target='_blank' title='Show stats' href='<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=" + options.rowId + "'>"
+					+ cellValue  + "</a>" : "";
+		}
+		
+		// add a new collection
+		function addCollection() {
+			// get collection name from a pop up
+			var name = prompt("New collection name"),
+				lower = name.toLowerCase();
+			// check if a collection with same name already exists
+			$('.collection-grid').each(function(){
+				if ($(this).data('collectionName').trim().toLowerCase() == lower) {
+					alert('Collection with such name already exists');
+					name = null;
+					return false;
+				}
+			});
+			if (name) {
+				$.ajax({
+					'url'  : '<lams:LAMSURL />qb/collection/addCollection.do',
+					'type' : 'POST',
+					'dataType' : 'text',
+					'data' : {
+						'name' : name
+					},
+					'cache' : false
+				}).done(function(){
+					document.location.reload();
+				});
+			}
+		}
+	</script>
+</lams:head>
+<body class="stripes">
+<lams:Page title="Collection management" type="admin">
+	<%-- This option can be switched off in sysadmin --%>
+	<c:if test="${createCollectionAllowed}">
+		<div id="add-collection-div">
+			<button id="add-collection-button" class="btn btn-primary" onClick="javascript:addCollection()">Add collection</button>
+		</div>
+	</c:if>
+	
+	<c:forEach var="collection" items="${collections}">
+		<div class="panel-body">
+			<%-- Build collection title with its name, question count, optional "private" flag and edit button --%>
+			<c:set var="collectionTitle">
+				<a href="<lams:LAMSURL />qb/collection/showOne.do?collectionUid=${collection.uid}"><c:out value="${collection.name}" />
+					<span class="grid-question-count">(${questionCount[collection.uid]} questions)</span>
+					<c:if test="${collection.personal}">
+						<span class="grid-collection-private"><i class="fa fa-lock"></i> Private</span>
+					</c:if>
+				</a>
+				<button class="btn btn-primary btn-xs edit-button"
+						onClick="javascript:document.location.href=`<lams:LAMSURL />qb/collection/showOne.do?collectionUid=${collection.uid}`">
+					Edit
+				</button>
+			</c:set>
+				
+			<%-- jqGrid placeholder with some useful attributes --%>
+			<table class="collection-grid" data-collection-uid="${collection.uid}"
+			 	   data-collection-name='<c:out value="${collection.name}" />' data-collection-title='${collectionTitle}'>
+			</table>
+		</div>
+	</c:forEach>
+</lams:Page>
+</body>
 </lams:html>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -rce08b5834386d861110869e90237174b8969f3a0
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision ce08b5834386d861110869e90237174b8969f3a0)
@@ -140,7 +140,7 @@
     private List<QbQuestionUnit> units = new ArrayList<>();
 
     // read-only collection of learning outcomes
-    @ManyToMany(fetch = FetchType.LAZY)
+    @ManyToMany(fetch = FetchType.EAGER)
     @Fetch(FetchMode.SUBSELECT)
     @JoinTable(name = "lams_outcome_mapping", joinColumns = @JoinColumn(name = "qb_question_id", referencedColumnName = "question_id", updatable = false, insertable = false), inverseJoinColumns = @JoinColumn(name = "outcome_id"))
     private List<Outcome> outcomes = new ArrayList<>();
@@ -422,4 +422,12 @@
     public void setUnits(List<QbQuestionUnit> units) {
 	this.units = units;
     }
+
+    public List<Outcome> getOutcomes() {
+	return outcomes;
+    }
+
+    public void setOutcomes(List<Outcome> outcomes) {
+	this.outcomes = outcomes;
+    }
 }
\ No newline at end of file