Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -rf9b834818dc5ef33a5534001481b70975ea7d529 -r3c6cdee7feaf4d150800c775c8571fb61621f211
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision f9b834818dc5ef33a5534001481b70975ea7d529)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 3c6cdee7feaf4d150800c775c8571fb61621f211)
@@ -151,7 +151,8 @@
 
 function loadOrganisation() {
 	$("#page-wrapper").finish().fadeOut(200, function() {
-		$("#org-container").load(
+		$(this).html('<div class="text-center m-5"><i class="fa fa-refresh fa-spin fa-2x fa-fw"></i>').show()
+		.load(
 			"displayGroup.do",
 			{
 				orgId   : activeOrgId
@@ -170,11 +171,6 @@
 					//do it with a small delay so it will be understood that the new organisation is selected indeed
 					$("body").addClass('offcanvas-hidden', 300);
 				}
-					
-    			//in case there is no lessons-table, show page back (instead of doing it in datatables init event)
-    			if ($('.lessons-table').length == 0) {
-    				$("#page-wrapper").finish().fadeTo(400, 1);
-    			}
 			}
 		);    
 	});
Index: lams_central/web/main.jsp
===================================================================
diff -u -rf9b834818dc5ef33a5534001481b70975ea7d529 -r3c6cdee7feaf4d150800c775c8571fb61621f211
--- lams_central/web/main.jsp	(.../main.jsp)	(revision f9b834818dc5ef33a5534001481b70975ea7d529)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 3c6cdee7feaf4d150800c775c8571fb61621f211)
@@ -452,10 +452,7 @@
 		            },
 		        	//row-reordering feature
 		        	{"width": "20px", "visible": lessonsTable.data("row-reordering-enabled")},
-		         ],
-		         	"initComplete": function(settings, json) {
-		         		$("#page-wrapper").finish().fadeIn();
-		       	  	}
+		         ]
 				})
 				.on( 'row-reorder', function ( e, diff, edit ) {
 					//store new lesson order in DB
@@ -663,7 +660,6 @@
 		<div class="row no-gutter">
 			<div class="col-12">
 	        	<div id="org-container" class="tour-org-container"></div>
-	        	<div id="org-container-temp" style="display: none;"></div>
 			</div>
 		</div>
 	</div>