Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.77.2.29 -r1.77.2.30
--- lams_central/web/main.jsp	28 Oct 2016 02:49:07 -0000	1.77.2.29
+++ lams_central/web/main.jsp	28 Oct 2016 17:05:38 -0000	1.77.2.30
@@ -114,12 +114,12 @@
 				<div>
 					<img alt="LAMS" src="images/svg/lams_logo_white.svg">
 				</div>
-				<i class="icon-remove fa fa-close fa-lg offcanvas-toggle"></i>
+				<a class="offcanvas-toggle"><i class="icon-remove fa fa-bars fa-lg"></i></a>
 			</div>
 			
 			<div class="offcanvas-header">
 				<span class="courses-title ">
-					<i class="fa fa-table"></i>&nbsp;&nbsp;Courses
+					<i class="fa fa-table"></i>&nbsp;<fmt:message key="organisations" />
 				</span>
 			</div>
         
Index: lams_central/web/css/main.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/Attic/main.css,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_central/web/css/main.css	27 Oct 2016 16:02:36 -0000	1.1.2.3
+++ lams_central/web/css/main.css	28 Oct 2016 17:05:38 -0000	1.1.2.4
@@ -18,8 +18,8 @@
 .courses-title {
     text-overflow: ellipsis;
     overflow: hidden;
-    font-weight: 400;
-    font-size: 24px;
+    font-weight: 300;
+    font-size: 23px;
     width: 100%;
     color: #ECF0F1 !important;
     margin-left: 0 !important;
@@ -38,7 +38,7 @@
 .offcanvas-hidden #page-wrapper {
 	margin: 0 0 0 0;
 }
-@media (min-width: 768px) {
+@media (min-width: 769px) {
 	.icon-remove {
 		display: none !important;
 	}
@@ -186,7 +186,7 @@
 	cursor: pointer;
 	position: absolute;
 	width: 40px;
-	top: 20px;
+	top: 30px;
 	right: 5px;
 }
 .icon-remove:hover {
@@ -220,6 +220,7 @@
     padding: 15px 15px 0;
     margin: 0;
 }
+
 .offcanvas-toggle i {
     font-size: 26px;
 }
Index: lams_central/web/includes/javascript/main.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/main.js,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_central/web/includes/javascript/main.js	28 Oct 2016 02:49:07 -0000	1.1.2.3
+++ lams_central/web/includes/javascript/main.js	28 Oct 2016 17:05:38 -0000	1.1.2.4
@@ -1,7 +1,5 @@
 $(document).ready(function () {
 	
-	//initButtons(); //TODO remove?
-	
 	// open active course. in case active course is not yet chosen by user, it will be opened after tablesorter's pager receives all orgs
 	if (activeOrgId != null) {
 		loadOrganisation();
@@ -149,9 +147,6 @@
 		{
 			dispatch : "storeLastVisitedOrganisation",
 			orgId   : activeOrgId
-		},
-		function() {
-			//initButtons("org-container"); //TODO remove?
 		}
 	);
 }
@@ -164,8 +159,11 @@
 			stateId : stateId,
 			orgId   : activeOrgId
 		},
-		function() {
-			//initButtons("org-container"); //TODO remove?
+		function( response, status, xhr ) {
+			//in case of any server error - open offcanvas bar so user can select another course
+			if ( status == "error" ) {
+				$("body").removeClass("offcanvas-hidden");
+			}			
 		}
 	);
 }
@@ -189,45 +187,7 @@
 	);	
 }
 
-//TODO remove?
-function initButtons(containerId) {
-	var container = containerId ? $('#' + containerId) : document;
 
-	$(".ui-button", container).button();
-	$(".split-ui-button", container).each(function(){
-		var buttonContainer = $(this),
-			buttons = buttonContainer.children();
-		
-		buttons.first().button()
-			   .next().button({
-			text : false,
-			icons : {
-				primary : "ui-icon-triangle-1-s"
-			}
-		});
-		
-		buttonContainer.buttonset().next().hide().menu();
-		
-		buttons.each(function(){
-			var button = $(this);
-			if (!button.attr('onclick')) {
-				button.click(function() {
-					var menu = $(this).parent().next().show().position({
-						my : "right top",
-						at : "right bottom",
-						of : $(this).parent()
-					});
-					$(document).one("click", function() {
-						menu.hide();
-					});
-					return false;
-				});
-			}
-		});
-	});
-}
-
-
 function showMyProfileDialog() {
 	showDialog("dialogMyProfile", {
 		'title' : LABELS.MY_PROFILE,
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/FavoriteOrganisationDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/Attic/FavoriteOrganisationDAO.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/FavoriteOrganisationDAO.java	27 Oct 2016 16:00:52 -0000	1.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/FavoriteOrganisationDAO.java	28 Oct 2016 17:05:57 -0000	1.1.2.2
@@ -28,6 +28,7 @@
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.usermanagement.FavoriteOrganisation;
 import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationState;
 import org.lamsfoundation.lams.usermanagement.dao.IFavoriteOrganisationDAO;
 import org.springframework.stereotype.Repository;
 
@@ -49,6 +50,7 @@
     @Override
     public List<Organisation> getFavoriteOrganisationsByUser(Integer userId) {
 	final String query = "SELECT fav.organisation from FavoriteOrganisation fav WHERE fav.user.userId=" + userId
+		+ " AND fav.organisation.organisationState.organisationStateId = " + OrganisationState.ACTIVE
 		+ " ORDER BY fav.organisation.name";
 	return find(query);
     }