Index: lams_admin/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_admin/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_admin/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_central/conf/scss/_lams_variables.scss
===================================================================
diff -u -rf0dd067cb016bd5669a5d1316fca29cf70464cda -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_central/conf/scss/_lams_variables.scss	(.../_lams_variables.scss)	(revision f0dd067cb016bd5669a5d1316fca29cf70464cda)
+++ lams_central/conf/scss/_lams_variables.scss	(.../_lams_variables.scss)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -8,27 +8,26 @@
 // LAMS SASS Global Variables
 $gray-light-mid:  $grey-300; // #dddddd
 $gray-lightest:  $grey-100; // #f5f5f5 or whitesmoke
-// 
+ 
 // Primary colour shades
-// $brand-primary-darkest: #072B57; // used for main page offcanvas course list
-// $brand-primary-darker: #164276;  // used for main page offcanvas course list
-$brand-primary-mid: lighten($brand-primary, 12%); // #5798d0
-$brand-primary-light: lighten($brand-primary, 45%); // #dbe9f5
-// next one is to be removed!!!!
-$brand-primary-bright: $brand-rose;   // used when we need a primary standout, such as the right hand bar indicating the current org in the offcanvas course list.
-// 
+$brand-primary-darkest: $blue-a700; // used for main page offcanvas course list
+$brand-primary-darker: $blue-a400;  // used for main page offcanvas course list
+$brand-primary-mid: $blue-a200;
+$brand-primary-light: $blue-a100;
+$brand-primary-bright: $blue-500;   // used when we need a primary standout, such as the right hand bar indicating the current org in the offcanvas course list.
+
 // a links
 $a-link-default: $brand-primary;
 $a-link-default-hover: $brand-primary-bright;
 $a-link-default-focus: $brand-primary-bright;
-// 
+ 
 // Success Green shades
-$brand-success-light: lighten($green-500, 25%); // #b5dfb5
-// 
+$brand-success-light: $green-200;
+
 // Warning Yellow shades:
-$contrast-fade-start: lighten($orange-500, 50%); // Used in Forum, Comment for highlighting replies
-$contrast-light: lighten($orange-500,  20%); 
-// 
+$contrast-fade-start: $orange-300; // Used in Forum, Comment for highlighting replies
+$contrast-light: $orange-50; 
+ 
 // Borders in various colours
 // Grey or black
 $legend-border-color: #e5e5e5;
@@ -68,28 +67,27 @@
 $optional-activity-background: lighten($brand-primary-mid, 35%);
 $optional-activity-background-heading: lighten($brand-primary-mid, 5%); 
 $optional-activity-background-hover: $contrast-light;
-$completed-activity-fill: #000099;
-$current-activity-fill: #BB0000;
-$gate-activity-fill: #FF0000;
-$complex-activity-fill: #999999;
-$not-started-activity-fill: #009900;
+$completed-activity-fill: $blue-a700;
+$current-activity-fill: $red-900;
+$gate-activity-fill: $red;
+$complex-activity-fill: $grey;
+$not-started-activity-fill: $green;
 
-// 
 // Used just for main.css - the main page
-// $main_default_link: #5A738E;
-// $main_blue_light_highlight: #A6E5FD;
-// $main_fav_org_link: #A7B1C2;
-// $main_offcanvas_link: #2B5B95;
-// $main_offcanvas_link_color: $body-bg;
-// $main_offcanvas_background: $brand-primary-darker;
-// $main_offcanvas_color: $gray-lighter;
-// $main_offcanvas_logo_background: $brand-primary-darkest;
-// $main_offcanvas_search_background: $brand-primary-darkest;
-// $main_dropdown_border: #D9DEE4;
-// $main_navbar_link: #515356;
-// $main_singlelesson_hover_border: #9be0f9;
-// $main_singlelesson_hover_background: #F0F8FF;
-// 
+$main_default_link: #5A738E;
+$main_blue_light_highlight: #A6E5FD;
+$main_fav_org_link: #A7B1C2;
+$main_offcanvas_link: #2B5B95;
+$main_offcanvas_link_color: $gray-lightest;
+$main_offcanvas_background: $brand-primary;
+$main_offcanvas_color: $gray-lightest;
+$main_offcanvas_logo_background: $brand-primary-darkest;
+$main_offcanvas_search_background: $brand-primary-darkest;
+$main_dropdown_border: #D9DEE4;
+$main_navbar_link: #515356;
+$main_singlelesson_hover_border: #9be0f9;
+$main_singlelesson_hover_background: #F0F8FF;
+ 
 // navbar login bar
 // $navbar-brand-login-color: #ffffff;
 // $navbar-login-background: $brand-primary;
@@ -106,8 +104,8 @@
 // $login_logo_size: auto 20px;
 // $login-logo_div_width: 100px;
 // 
-// $offcanvas_logo: "/lams/images/svg/lams_logo_white.svg";
-// $offcanvas_height: 31px;
+$offcanvas_logo: "/lams/images/svg/lams_logo_white.svg";
+$offcanvas_height: 30px;
 
 // generic portrait colors
 $portrait-color-0:#001f3f;
Index: lams_central/conf/scss/_lams_variables_purple.scss
===================================================================
diff -u -rf0dd067cb016bd5669a5d1316fca29cf70464cda -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_central/conf/scss/_lams_variables_purple.scss	(.../_lams_variables_purple.scss)	(revision f0dd067cb016bd5669a5d1316fca29cf70464cda)
+++ lams_central/conf/scss/_lams_variables_purple.scss	(.../_lams_variables_purple.scss)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -12,27 +12,26 @@
 // LAMS SASS Global Variables
 $gray-light-mid:  $grey-300; // #dddddd
 $gray-lightest:  $grey-100; // #f5f5f5 or whitesmoke
-// 
+
 // Primary colour shades
-// $brand-primary-darkest: #072B57; // used for main page offcanvas course list
-// $brand-primary-darker: #164276;  // used for main page offcanvas course list
-$brand-primary-mid: lighten($brand-primary, 12%); // #5798d0
-$brand-primary-light: lighten($brand-primary, 45%); // #dbe9f5
-// next one is to be removed!!!!
+$brand-primary-darkest: $purple-900; // used for main page offcanvas course list
+$brand-primary-darker: $purple-700;  // used for main page offcanvas course list
+$brand-primary-mid: $purple-200; 
+$brand-primary-light: $purple-50;
 $brand-primary-bright: $brand-rose;   // used when we need a primary standout, such as the right hand bar indicating the current org in the offcanvas course list.
-// 
+
 // a links
 $a-link-default: $brand-primary;
 $a-link-default-hover: $brand-primary-bright;
 $a-link-default-focus: $brand-primary-bright;
-// 
+
 // Success Green shades
-$brand-success-light: lighten($green-500, 25%); // #b5dfb5
-// 
+$brand-success-light: $green-200;
+
 // Warning Yellow shades:
-$contrast-fade-start: lighten($orange-500, 50%); // Used in Forum, Comment for highlighting replies
-$contrast-light: lighten($orange-500,  20%); 
-// 
+$contrast-fade-start: $orange-300; // Used in Forum, Comment for highlighting replies
+$contrast-light: $orange-50; 
+
 // Borders in various colours
 // Grey or black
 $legend-border-color: #e5e5e5;
@@ -57,28 +56,27 @@
 $optional-activity-background: lighten($brand-primary-mid, 35%);
 $optional-activity-background-heading: lighten($brand-primary-mid, 5%); 
 $optional-activity-background-hover: $contrast-light;
-$completed-activity-fill: #000099;
-$current-activity-fill: #BB0000;
-$gate-activity-fill: #FF0000;
-$complex-activity-fill: #999999;
-$not-started-activity-fill: #009900;
+$completed-activity-fill: $blue-a700;
+$current-activity-fill: $red-900;
+$gate-activity-fill: $red;
+$complex-activity-fill: $grey;
+$not-started-activity-fill: $green;
 
-// 
 // Used just for main.css - the main page
-// $main_default_link: #5A738E;
-// $main_blue_light_highlight: #A6E5FD;
-// $main_fav_org_link: #A7B1C2;
-// $main_offcanvas_link: #2B5B95;
-// $main_offcanvas_link_color: $body-bg;
-// $main_offcanvas_background: $brand-primary-darker;
-// $main_offcanvas_color: $gray-lighter;
-// $main_offcanvas_logo_background: $brand-primary-darkest;
-// $main_offcanvas_search_background: $brand-primary-darkest;
-// $main_dropdown_border: #D9DEE4;
-// $main_navbar_link: #515356;
-// $main_singlelesson_hover_border: #9be0f9;
-// $main_singlelesson_hover_background: #F0F8FF;
-// 
+$main_default_link: #5A738E;
+$main_blue_light_highlight: #A6E5FD;
+$main_fav_org_link: #A7B1C2;
+$main_offcanvas_link: #2B5B95;
+$main_offcanvas_link_color: $gray-lightest;
+$main_offcanvas_background: $brand-primary;
+$main_offcanvas_color: $gray-lightest;
+$main_offcanvas_logo_background: $brand-primary-darkest;
+$main_offcanvas_search_background: $brand-primary-darkest;
+$main_dropdown_border: #D9DEE4;
+$main_navbar_link: #515356;
+$main_singlelesson_hover_border: #9be0f9;
+$main_singlelesson_hover_background: #F0F8FF;
+
 // navbar login bar
 // $navbar-brand-login-color: #ffffff;
 // $navbar-login-background: $brand-primary;
@@ -94,9 +92,9 @@
 // $login_logo: "/lams/images/svg/lams_logo_black.svg";
 // $login_logo_size: auto 20px;
 // $login-logo_div_width: 100px;
-// 
-// $offcanvas_logo: "/lams/images/svg/lams_logo_white.svg";
-// $offcanvas_height: 31px;
+ 
+$offcanvas_logo: "/lams/images/svg/lams_logo_white.svg";
+$offcanvas_height: 30px;
 
 // generic portrait colors
 $portrait-color-0:#001f3f;
Index: lams_central/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_central/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_central/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_central/web/css/_main_base.scss
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_central/web/css/_main_base.scss	(.../_main_base.scss)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_central/web/css/_main_base.scss	(.../_main_base.scss)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -3,73 +3,69 @@
 	display: inline;  // replaces display: flex 
 }
 
-navbar-brand {
-	padding: 0.625rem;
+body {
+ 	width: 100%;
+ 	overflow-x: hidden;
+// 	font-size: 13px;
+// 	background: $stripes_background;
 }
 
+html {
+	height: 100%;
+}
+#offcanvas {
+	position: fixed;
+	width: 220px;
+	z-index: 10;
+	height: 100%;
+	background: $main_offcanvas_background;
+    color: $main_offcanvas_color;
+}
+.courses-title {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    font-weight: 300;
+    font-size: 23px;
+    width: 100%;
+    margin-left: 0 !important;
+    line-height: 49px;
+    margin: 0;
+    padding-left: 25px;
+}
+#page-wrapper {
+	margin: 0 0 0 220px;
+	padding: 10px 20px 0px;
+}
+.offcanvas-hidden #offcanvas {
+	display: none;
+}
+.offcanvas-hidden #page-wrapper {
+	margin: 0 0 0 0;
+}
+@media (min-width: 769px) {
+	.icon-remove {
+		display: none !important;
+	}
+}
+@media (max-width: 768px) {
+	#offcanvas {
+		width: 100%;
+	}
+	.navbar-nav .open .dropdown-menu {
+    	top:52px; /*hack to prevent disappearing*/
+	}
+}
+@media (max-width: 870px) {
+	body.offcanvas-hidden .xs-hidden {
+		display: none !important;
+	}
+}
+@media (max-width: 1170px) {
+	body:not(.offcanvas-hidden) .xs-hidden {
+		display: none !important;
+	}
+}
 
-// body {
-// 	width: 100%;
-// 	overflow-x: hidden;
-// 	font-size: 13px;
-// 	background: $stripes_background;
-// }
-// html {
-// 	height: 100%;
-// }
-// #offcanvas {
-// 	position: fixed;
-// 	width: 220px;
-// 	z-index: 10;
-// 	height: 100%;
-// 	background: $main_offcanvas_background;
-//     color: $main_offcanvas_color;
-// }
-// .courses-title {
-//     text-overflow: ellipsis;
-//     overflow: hidden;
-//     font-weight: 300;
-//     font-size: 23px;
-//     width: 100%;
-//     margin-left: 0 !important;
-//     line-height: 49px;
-//     margin: 0;
-//     padding-left: 25px;
-// }
-// #page-wrapper {
-// 	margin: 0 0 0 220px;
-// 	padding: 10px 20px 0px;
-// }
-// .offcanvas-hidden #offcanvas {
-// 	display: none;
-// }
-// .offcanvas-hidden #page-wrapper {
-// 	margin: 0 0 0 0;
-// }
-// @media (min-width: 769px) {
-// 	.icon-remove {
-// 		display: none !important;
-// 	}
-// }
-// @media (max-width: 768px) {
-// 	#offcanvas {
-// 		width: 100%;
-// 	}
-// 	.navbar-nav .open .dropdown-menu {
-//     	top:52px; /*hack to prevent disappearing*/
-// 	}
-// }
-// @media (max-width: 870px) {
-// 	body.offcanvas-hidden .xs-hidden {
-// 		display: none !important;
-// 	}
-// }
-// @media (max-width: 1170px) {
-// 	body:not(.offcanvas-hidden) .xs-hidden {
-// 		display: none !important;
-// 	}
-// }
-// 
 .content {
 // 	padding: 7px 10px;
  	background: $body-bg;
@@ -95,116 +91,116 @@
 // a:hover, a:focus {
 // 	color: $brand-primary-darker;
 // }
-// 
-// /*OFFCANVAS BAR*/
-// #favorite-organisations {
-//     border-top: 1px solid rgba(255, 255, 255, 0.16);
-// 	border-bottom: 1px solid rgba(255, 255, 255, 0.16);
-// }
-// #favorite-organisations > li > a, .tablesorter a {
-// 	color: $main_fav_org_link;
-//     font-weight: 400;
-//     padding: 14px 20px 14px 25px;
-// }
-// #favorite-organisations > li > a:hover,
-// #favorite-organisations > li > a:focus,
-// .pagesize:hover,
-// .tablesorter a:hover,
-// .tablesorter a:focus {
-//   background-color: $brand-primary-darkest;
-//   color: white;
-// }
-// .tablesorter a {
-//     display:block;
-//     text-decoration:none;
-//     font-size: 13px;
-// }
-// #offcanvas .active > a,
-// #offcanvas .active > a:hover,
-// #offcanvas .active > a:focus {
-// 	background: $main_offcanvas_link;
-// }
-// #offcanvas .active > a {
-//     color: $main_offcanvas_link_color;
-// }
-// #offcanvas td.active {
-//     border-right: 10px solid $brand-primary-bright;
-//     background: $main_offcanvas_link;
-// }
-// .offcanvas-logo {
-// 	padding: 20px 0px 15px 25px;
-//     background-color: $main_offcanvas_logo_background;
-// }
-// .offcanvas-logo .logo {
-//     background: url($offcanvas_logo) no-repeat center left;
-//     height: $offcanvas_height;
-// }
-// .offcanvas-header {
-// 	padding: 15px 0px 0px 0px;
-// }
-// .offcanvas-search {
-// 	padding: 15px 19px 15px;
-// 	margin-bottom: 0;
-// }
-// .offcanvas-search .form-control {
-// 	box-shadow: inset 0 1px 0px rgba(208, 206, 206, 0.25);
-// 	border-radius: 25px;
-// 	padding: 2px 5px;
-// 	line-height: 1;
-// 	border: 1px solid rgba(221, 226, 232, 0.49);
-// 	background: $main_offcanvas_search_background; 
-// 	color: $main_fav_org_link;
-// }
-// .offcanvas-search .form-control::-webkit-input-placeholder { /* WebKit, Blink, Edge */
-//     color: $gray-light-mid;
-// }
-// .offcanvas-search .form-control:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-//    color: $gray-light-mid;
-// }
-// .offcanvas-search .form-control::-moz-placeholder { /* Mozilla Firefox 19+ */
-//    color: $gray-light-mid;
-// }
-// .offcanvas-search .form-control:-ms-input-placeholder { /* Internet Explorer 10-11 */
-//    color: $gray-light-mid;
-// }
-// .ts-pager {
-// 	text-align: center;
-//     padding: 0 10px 10px;
-//     color: darken($main_fav_org_link, 30%);
-// }
-// .ts-pager .btn{
-// 	color: darken($main_fav_org_link, 10%);
-//     background-color: $brand-primary-darkest;
-//     padding: 2px 5px;
-//     line-height: 1;
-// }
-// .tablesorter tfoot i {
-// 	font-size: 11px;
-// }
-// .tablesorter tfoot th {
-// 	background-color: $brand-primary-darkest !important;
-// 	padding: 10px 0;
-// }
-// 
-// .pagesize {
-//     border: 1px solid rgba(221, 226, 232, 0.49);
-//     background: $brand-primary-darker;
-//     cursor: pointer;
-// }
-// 
-// .icon-remove {
-// 	cursor: pointer;
-// 	position: absolute;
-// 	width: 40px;
-// 	top: 30px;
-// 	right: 5px;
-// }
-// .icon-remove:hover {
-// 	color: $body-bg;
-// }
-// .fa-chevron-circle-right.fa-lg {
-// 	line-height: 1em;
-// }
+
+/*OFFCANVAS BAR*/
+#favorite-organisations {
+    border-top: 1px solid rgba(255, 255, 255, 0.16);
+	border-bottom: 1px solid rgba(255, 255, 255, 0.16);
+}
+#favorite-organisations > li > a, .tablesorter a {
+	color: $main_fav_org_link;
+    font-weight: 400;
+    padding: 14px 20px 14px 25px;
+}
+#favorite-organisations > li > a:hover,
+#favorite-organisations > li > a:focus,
+.pagesize:hover,
+.tablesorter a:hover,
+.tablesorter a:focus {
+  background-color: $brand-primary-darkest;
+  color: white;
+}
+.tablesorter a {
+    display:block;
+    text-decoration:none;
+    font-size: 13px;
+}
+#offcanvas .active > a,
+#offcanvas .active > a:hover,
+#offcanvas .active > a:focus {
+	background: $main_offcanvas_link;
+}
+#offcanvas .active > a {
+    color: $main_offcanvas_link_color;
+}
+#offcanvas td.active {
+    border-right: 10px solid $brand-primary-bright;
+    background: $main_offcanvas_link;
+}
+.offcanvas-logo {
+	padding: 20px 0px 15px 25px;
+    background-color: $main_offcanvas_logo_background;
+}
+.offcanvas-logo .logo {
+    background: url($offcanvas_logo) no-repeat center left;
+    height: $offcanvas_height;
+}
+.offcanvas-header {
+	padding: 15px 0px 0px 0px;
+}
+.offcanvas-search {
+	padding: 15px 19px 15px;
+	margin-bottom: 0;
+}
+.offcanvas-search .form-control {
+	box-shadow: inset 0 1px 0px rgba(208, 206, 206, 0.25);
+	border-radius: 25px;
+	padding: 2px 5px;
+	line-height: 1;
+	border: 1px solid rgba(221, 226, 232, 0.49);
+	background: $main_offcanvas_search_background; 
+	color: $main_fav_org_link;
+}
+.offcanvas-search .form-control::-webkit-input-placeholder { /* WebKit, Blink, Edge */
+    color: $gray-light-mid;
+}
+.offcanvas-search .form-control:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+   color: $gray-light-mid;
+}
+.offcanvas-search .form-control::-moz-placeholder { /* Mozilla Firefox 19+ */
+   color: $gray-light-mid;
+}
+.offcanvas-search .form-control:-ms-input-placeholder { /* Internet Explorer 10-11 */
+   color: $gray-light-mid;
+}
+.ts-pager {
+	text-align: center;
+    padding: 0 10px 10px;
+    color: darken($main_fav_org_link, 30%);
+}
+.ts-pager .btn{
+	color: darken($main_fav_org_link, 10%);
+    background-color: $brand-primary-darkest;
+    padding: 2px 5px;
+    line-height: 1;
+}
+.tablesorter tfoot i {
+	font-size: 11px;
+}
+.tablesorter tfoot th {
+	background-color: $brand-primary-darkest !important;
+	padding: 10px 0;
+}
+
+.pagesize {
+    border: 1px solid rgba(221, 226, 232, 0.49);
+    background: $brand-primary-darker;
+    cursor: pointer;
+}
+
+.icon-remove {
+	cursor: pointer;
+	position: absolute;
+	width: 40px;
+	top: 30px;
+	right: 5px;
+}
+.icon-remove:hover {
+	color: $body-bg;
+}
+.fa-chevron-circle-right.fa-lg {
+	line-height: 1em;
+}
 // /*TOP HEADER*/
 // .top-nav {
 //     background: $gray-lighter;
@@ -213,47 +209,67 @@
 //     height: 53px;
 // 	box-shadow: 0 1px 1px rgba(8, 8, 8, 0.5);
 // }
-// .offcanvas-toggle-header {
-//     float: left;
-//     margin: 0;
-//     padding: 15px 0 10px 7px;
-//     width: 70px;
-//     cursor: pointer;
-//     border-radius: 3px;
-// }
-// @media (min-width: 768px) {
-// 	.offcanvas-toggle-header {
-// 	    padding-top: 20px;
-// 	    padding-bottom: 15px;
-// 	}
+.navbar {
+	margin: 0 0 0 220px;
+	padding: 0px 20px 0px;
+}
+.offcanvas-hidden .navbar {
+	margin: 0 0 0 0;
+}
+.offcanvas-hidden .navbar {
+	margin: 0 0 0 0;
+}
+
+.navbar-logo {
+	padding: 0.625rem;
+	display: none;
+}
+
+.offcanvas-hidden .navbar-logo {
+	display: initial;
+}
+
+.offcanvas-toggle-header {
+    float: left;
+    margin: 0;
+    padding: 15px 0 10px 7px;
+    width: 70px;
+    cursor: pointer;
+    border-radius: 3px;
+}
+@media (min-width: 768px) {
+	.offcanvas-toggle-header {
+	    padding-top: 20px;
+	    padding-bottom: 15px;
+	}
 // 	.top-nav {
 // 		height: 63px;
 // 	}
-// }
-// .offcanvas-toggle-header i {
-//     padding: 0 15px 0;
-//     color: $brand-primary-darker;
-// }
-// 
-// .offcanvas-toggle i {
-//     font-size: 26px;
-// }
-// .top-nav .navbar-right {
-//     margin: 0;
-//     width: 70%;
-//     float: right;
-// }
-// .top-nav .navbar-right li {
-//     display: inline-block;
-//     float: right;
-//     position: static;
-//     border-radius: 3px;
-// }
-// @media (min-width: 480px) {
-//   .top-nav .navbar-right li {
-//     position: relative; 
-//   } 
-// }
+ }
+.offcanvas-toggle-header i {
+    padding: 0 15px 0;
+}
+
+.offcanvas-toggle i {
+    font-size: 26px;
+}
+.top-nav .navbar-right {
+    margin: 0;
+    width: 70%;
+    float: right;
+}
+.top-nav .navbar-right li {
+    display: inline-block;
+    float: right;
+    position: static;
+    border-radius: 3px;
+}
+@media (min-width: 480px) {
+  .top-nav .navbar-right li {
+    position: relative; 
+ 	 } 
+}
+
 // .top-nav .dropdown-menu li {
 //     width: 100%;
 // }
Index: lams_central/web/main.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -145,7 +145,7 @@
 <body <c:if test="${not empty activeOrgId}">class="offcanvas-hidden"</c:if>>
 
 <!-- Offcanvas Bar -->
- <%--    <nav id="offcanvas" role="navigation">
+    <nav id="offcanvas" role="navigation">
         <div class="offcanvas-scroll-area">
         
 			<div class="offcanvas-logo">
@@ -175,21 +175,20 @@
 			</div>
 			
         </div>
-    </nav> --%>
+    </nav>
 <!-- /Offcanvas Bar -->
 
-<!-- header -->
-<header class="navbar navbar-expand navbar-dark bg-primary flex-column flex-md-row bd-navbar">
-	<a class="navbar-brand navbar-brand-login" href="#"><%=Configuration.get(ConfigurationKeys.SITE_NAME)%></a>
-    
-<!-- 	<div class="top-nav">
+<div class="navbar navbar-expand navbar-dark bg-primary flex-column flex-md-row bd-navbar" id="mainNavBar">
+	<!-- header -->
+	<div class="container-fluid top-nav">
 	
 		<div class="offcanvas-toggle offcanvas-toggle-header">
 			<i class="fa fa-bars tour-course-reveal"></i>
 		</div>
 
- -->
- <div class="navbar-nav-scroll ml-md-auto ">
+	<a class="navbar-brand navbar-brand-login navbar-logo" href="#"><%=Configuration.get(ConfigurationKeys.SITE_NAME)%></a>
+    
+	 <div class="navbar-nav-scroll ml-md-auto ">
       <ul class="navbar-nav bd-navbar-nav flex-row">
 
 			<li role="presentation" class="nav-item align-self-center">
@@ -291,11 +290,13 @@
 		</ul>
 		</div>
 
-	</header>
+	</div>
+	</div>
 	<!-- /header -->
 
+<div id="page-wrapper">
+
 			<!-- content -->      
-	<main id="page-wrapper" class="content container-fluid">
 		<div id="messageCell">
 			<%--
 				<div id="message">Important annoucements might be posted here...</div>
Index: lams_gradebook/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_gradebook/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_gradebook/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_learning/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_learning/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_learning/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_monitoring/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_monitoring/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_monitoring/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_assessment/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_assessment/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_assessment/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_chat/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_chat/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_chat/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_daco/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_daco/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_daco/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_doku/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_doku/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_doku/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_forum/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_forum/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_forum/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_gmap/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_gmap/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_gmap/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_images/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_images/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_images/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_imscc/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_imscc/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_imscc/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_lamc/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_lamc/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_lamc/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_laqa/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_laqa/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_laqa/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_larsrc/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_larsrc/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_larsrc/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_leader/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_leader/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_leader/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_mindmap/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_mindmap/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_mindmap/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_nb/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_nb/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_nb/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_notebook/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_notebook/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_notebook/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_pixlr/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_pixlr/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_pixlr/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_preview/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_preview/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_preview/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_sbmt/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_sbmt/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_sbmt/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_scratchie/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_scratchie/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_scratchie/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_scribe/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_scribe/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_scribe/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_spreadsheet/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_survey/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_survey/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_survey/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_task/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_task/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_task/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_vote/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_vote/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_vote/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_wiki/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_wiki/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_wiki/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_tool_zoom/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_tool_zoom/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_zoom/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>
Index: lams_www/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -raa88d69d3da538a2d1a5ea967de8899c23ff9cd1
--- lams_www/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_www/web/WEB-INF/tags/SimplePanel.tag	(.../SimplePanel.tag)	(revision aa88d69d3da538a2d1a5ea967de8899c23ff9cd1)
@@ -5,7 +5,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
-<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+<%@ attribute name="cardBodyClass" required="false"  rtexprvalue="true"%>
 
 <c:if test="${not empty titleKey}">
 	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 	</c:if>
-	<div class="card-body ${panelBodyClass}">
+	<div class="card-body ${cardBodyClass}">
 		<jsp:doBody />
 	</div>
 </div>