Index: lams_central/web/qb/collection.jsp
===================================================================
diff -u -rca75b4c508f9d195245818cdd4574f335e75d9c6 -rba61b266e61e39c4c77682bb50921d3758c4524b
--- lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
+++ lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision ba61b266e61e39c4c77682bb50921d3758c4524b)
@@ -20,16 +20,12 @@
 		.row {
 			margin-top: 10px;
 		}
-		
-		.row > div:first-child, .row > div:last-child  {
-			text-align: left;
-			padding-left: 0;
+				
+		.middle-cell {
+			padding-top: 6px;
+			display: inline-block;
 		}
-		
-		.row > div {
-			text-align: right;
-		}
-		
+
 		.header-column {
 			font-weight: bold;
 		}
@@ -101,17 +97,13 @@
 		
 		// remove a collection
 		function removeCollection() {
-			var grid = $('#collection-grid'),
-				collectionUid = grid.data('collectionUid'),
-				name = grid.data('collectionName');
-		
-			if (confirm('Are you sure you want to remove "' + name + '" collection?')) {
+			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' : collectionUid
+						'collectionUid' : ${collection.uid}
 					},
 					'cache' : false
 				}).done(function(){
@@ -194,6 +186,7 @@
 	<div class="panel-body">
 		<c:choose>
 			<c:when test="${hasQuestions}">
+				<%-- Build collection title with its name, question count, optional "private" flag and edit button --%>
 				<c:set var="collectionTitle">
 					<c:out value="${collection.name}" />
 					<span class="grid-question-count">(${questionCount} questions)</span>
@@ -207,7 +200,9 @@
 				</table>
 			</c:when>
 			<c:otherwise>
-				There are no questions in this collection
+				<div class="header-column">
+					There are no questions in this collection
+				</div>
 			</c:otherwise>
 		</c:choose>
 
@@ -216,14 +211,14 @@
 		<c:if test="${not empty collection.userId and not collection.personal}">
 			<div class="container-fluid">
 				<div class="row">
-					<c:if test="${not hasQuestions}">
-						<div class="col-xs-12 col-md-2">
+					<div class="col-xs-12 col-md-2">
+						<c:if test="${not hasQuestions}">
 							<button class="btn btn-default" onClick="javascript:removeCollection()">Remove collection</button>
-						</div>
-					</c:if>
+						</c:if>
+					</div>
 					<c:if test="${not empty availableOrganisations}">
-						<div class="col-xs-12 col-md-2">
-							<span>Share collection with </span>
+						<div class="col-xs-12 col-md-2 middle-cell">
+							<span>Share collection with</span>
 						</div>
 						<div class="col-xs-12 col-md-6">
 							<select id="targetOrganisationSelect" class="form-control">
@@ -242,16 +237,16 @@
 				
 				<c:if test="${not empty collection.organisations}">
 					<div class="row">
-						<div class="col-xs-0 col-md-2"></div>
+						<div class="col-xs-0 col-md-4"></div>
 						<div class="col-xs-12 col-md-8 header-column">
 							<span>Shared with organisations</span>
 						</div>
 						<div class="col-xs-0 col-md-2"></div>
 					</div>
 					<c:forEach var="organisation" items="${collection.organisations}">
 						<div class="row">
-							<div class="col-xs-0 col-md-2"></div>
-							<div class="col-xs-0 col-md-8">
+							<div class="col-xs-0 col-md-4"></div>
+							<div class="col-xs-0 col-md-6 middle-cell">
 								<c:out value="${organisation.name}" />
 							</div>
 							<div class="col-xs-0 col-md-2">
Index: lams_central/web/qb/collectionList.jsp
===================================================================
diff -u -rca75b4c508f9d195245818cdd4574f335e75d9c6 -rba61b266e61e39c4c77682bb50921d3758c4524b
--- lams_central/web/qb/collectionList.jsp	(.../collectionList.jsp)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
+++ lams_central/web/qb/collectionList.jsp	(.../collectionList.jsp)	(revision ba61b266e61e39c4c77682bb50921d3758c4524b)
@@ -72,6 +72,7 @@
 				    colNames:[
 				    	"ID",
 				    	"Name",
+				    	// this column is hidden, so data coming from controller can be the same as for single collection view
 				    	"Used in # of lessons",
 				    	"Stats"
 				    ],
@@ -102,6 +103,7 @@
 		
 		// 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
@@ -130,6 +132,7 @@
 </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>
@@ -138,6 +141,7 @@
 	
 	<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">
 				<c:out value="${collection.name}" />
 				<span class="grid-question-count">(${questionCount[collection.uid]} questions)</span>
@@ -154,7 +158,6 @@
 			<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>
Index: lams_central/web/qb/stats.jsp
===================================================================
diff -u -rca75b4c508f9d195245818cdd4574f335e75d9c6 -rba61b266e61e39c4c77682bb50921d3758c4524b
--- lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision ca75b4c508f9d195245818cdd4574f335e75d9c6)
+++ lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision ba61b266e61e39c4c77682bb50921d3758c4524b)
@@ -31,6 +31,19 @@
 		#usage a {
 			text-decoration: underline;
 		}
+				
+		.row {
+			margin-top: 10px;
+		}
+		
+		.middle-cell {
+			padding-top: 6px;
+			display: inline-block;
+		}
+
+		.header-column {
+			font-weight: bold;
+		}
 	</style>
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
@@ -145,32 +158,7 @@
 					</div>
 				</div>
 			</div>
-			
-			<c:if test="${not empty availableCollections and transferAllowed}">
-				<div>
-					<span>Transfer questions to </span>
-					<select class="form-control" id="targetCollectionSelect">
-						<c:forEach var="target" items="${availableCollections}">
-							<option value="${target.uid}">
-								<c:out value="${target.name}" />
-							</option>
-						</c:forEach>
-					</select>
-					<button class="btn btn-default" onClick="javascript:addCollectionQuestion(false)">Add</button>
-					<button class="btn btn-default" onClick="javascript:addCollectionQuestion(true)">Copy</button>
-				</div>
-			</c:if>
-			
-			<div>
-				<span>Existing collections</span><br />
-				<c:forEach var="collection" items="${existingCollections}">
-					<c:out value="${collection.name}" />
-					<c:if test="${transferAllowed}">
-						<button class="btn btn-default" onClick="javascript:removeCollectionQuestion(${collection.uid})">Remove</button><br />
-					</c:if>
-				</c:forEach>
-			</div>
-				
+
 			<c:if test="${not empty question.qbOptions}">
 				<p class="question-section-header">Options</p>
 				<table class="table table-striped qb-stats-table">
@@ -212,6 +200,58 @@
 		</c:if>
 	</div>
 	
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			Management
+		</div>
+		<div class="panel-body">
+			<div class="container-fluid">
+				<c:if test="${not empty availableCollections and transferAllowed}">
+					<div class="row">
+						<div class="col-xs-12 col-md-2 middle-column">
+							Transfer questions to
+						</div>
+						<div class="col-xs-12 col-md-6">
+							<select class="form-control" id="targetCollectionSelect">
+								<c:forEach var="target" items="${availableCollections}">
+									<option value="${target.uid}">
+										<c:out value="${target.name}" />
+									</option>
+								</c:forEach>
+							</select>
+						</div>
+						<div class="col-xs-12 col-md-4">
+							<button class="btn btn-default" onClick="javascript:addCollectionQuestion(false)">Add</button>
+							<button class="btn btn-default" onClick="javascript:addCollectionQuestion(true)">Copy</button>
+						</div>
+					</div>
+				</c:if>
+				
+				<div class="row">
+					<div class="col-xs-0 col-md-2"></div>
+					<div class="col-xs-12 col-md-8 header-column">
+						Existing collections
+					</div>
+					<div class="col-xs-0 col-md-2"></div>
+				</div>
+				
+				<c:forEach var="collection" items="${existingCollections}">
+					<div class="row">
+						<div class="col-xs-0 col-md-2"></div>
+						<div class="col-xs-12 col-md-6 middle-cell">
+							<c:out value="${collection.name}" />
+						</div>
+						<div class="col-xs-12 col-md-2">
+							<c:if test="${transferAllowed}">
+								<button class="btn btn-default" onClick="javascript:removeCollectionQuestion(${collection.uid})">Remove</button>
+							</c:if>
+						</div>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+	
 	<c:if test="${not empty question.qbOptions}">
 		<div class="panel panel-default">
 			<div class="panel-heading">