Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -r2471b37f4df96b3f1930cf8dea8936b982d43e61 -rd51512da09f6ff8ccbf978c3d8eef3772963042f
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 2471b37f4df96b3f1930cf8dea8936b982d43e61)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision d51512da09f6ff8ccbf978c3d8eef3772963042f)
@@ -101,7 +101,26 @@
            railOpacity: 0.9
         });
     });
+    
+	//collapse subcourse. (Doing it manually instead of using bootstrap collapse in order to prevent bootstrap choppiness)
+    $(document).on('click', '.subcourse-title', function() { 
+		var orgId = $(this).data("groupid");
+		var collapsed = $("#" + orgId + "-lessons").hasClass("in");
+		
+		$("#" + orgId + "-lessons").toggleClass("in");
+		$(this).toggleClass("collapsed");
+		$("i", $(this)).toggleClass("fa-minus-square-o fa-plus-square-o");
 
+		//store course collapse in DB
+		$.ajax({
+			url: LAMS_URL + "/collapseOrganisation.do",
+			data: {
+				orgId: orgId, 
+				collapsed: collapsed
+			}
+		});
+    });
+
 });
 
 
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r1ea212824aed3f67314546966f021f788bf09fb8 -rd51512da09f6ff8ccbf978c3d8eef3772963042f
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 1ea212824aed3f67314546966f021f788bf09fb8)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision d51512da09f6ff8ccbf978c3d8eef3772963042f)
@@ -629,7 +629,8 @@
 	
 	if (contributeActivities ) {
 		$.each(contributeActivities, function(){
-			var cell = $('<div />').addClass('contributeActivityCell').text(this.title);
+			var contributeId = 'contribute' + this.activityID;
+			var cell = $('<div />').addClass('contributeActivityCell').text(this.title).attr('id', contributeId);
 			row = $('<div />').addClass('contributeRow').insertAfter(row).append(cell);
 			
 			$.each(this.contributeEntries, function(){
@@ -641,7 +642,7 @@
 					case 9  : entryContent = LABELS.CONTRIBUTE_BRANCHING; break;
 					case 11 : entryContent = LABELS.CONTRIBUTE_CONTENT_EDITED; break; 
 				}
-				entryContent += '<span class="btn btn-xs btn-primary pull-right" onClick="javascript:openPopUp(\''
+				entryContent += '<span id="' + contributeId + 'Btn" class="btn btn-xs btn-primary pull-right" onClick="javascript:openPopUp(\''
 							 + this.url + '\',\'ContributeActivity\', 800, 1280, true)" title="' + LABELS.CONTRIBUTE_TOOLTIP
 							 + '">' + LABELS.CONTRIBUTE_BUTTON + '</span>';
 				cell = $('<div />').addClass('contributeEntryCell').html(entryContent);