Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re0cc783b7adfa26b09769d31919df41b66852f02 -r1c254cdb23e07d238a56bb87b88a72835d8ce867
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e0cc783b7adfa26b09769d31919df41b66852f02)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1c254cdb23e07d238a56bb87b88a72835d8ce867)
@@ -19,7 +19,7 @@
 
 	<c:when test='${type == "navbar"}'>
 	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 		<jsp:doBody />
@@ -144,19 +144,21 @@
 			}
 			
 			$(document).ready(function() {
-				var showControlBar = true;
+				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
-				if ( window.frameElement ) { // parallel
+				if ( window.name.match("LearnerActivity") || window.parent.name.match("LearnerActivity")) { 
+					// popup window
+					showControlBar = 0;
+					showIM = false;
+				} else 	if ( window.frameElement ) { // parallel
 					var myId = window.frameElement.id;
 					if ( myId ) {
 						if ( myId == 'lamsDynamicFrame0' ) {
 							showIM = false;
-						} else if ( myId == 'lamsDynamicFrame1' ) {
-							showControlBar = false;
+						} else if ( myId == 'lamsDynamicFrame1') {
+							showControlBar = 2;
 						}
 					}
-				} else { // test for popup window
-					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
 				if ( lessonId != "" || toolSessionId != "" ) {
@@ -173,11 +175,13 @@
 							
 							lessonId = result.lessonID;
 							
-							if ( showControlBar ) {
+							if ( showControlBar == 1  ) {
 								allowRestart = result.allowRestart;
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
+							} else if ( showControlBar == 2 ) {
+								$('#navcontent').addClass('navcontent');
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -233,7 +237,7 @@
 	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
 
 		<div id="navcontent" class="content">
-			<div class="row no-gutter">
+			<div class="row no-gutter no-margin">
 			<div class="col-xs-12">
 			<div class="container">
 				<c:choose>
@@ -276,7 +280,7 @@
 
 	<c:otherwise>
 	<!-- Standard Screens  --> 
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re0cc783b7adfa26b09769d31919df41b66852f02 -r1c254cdb23e07d238a56bb87b88a72835d8ce867
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e0cc783b7adfa26b09769d31919df41b66852f02)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1c254cdb23e07d238a56bb87b88a72835d8ce867)
@@ -19,7 +19,7 @@
 
 	<c:when test='${type == "navbar"}'>
 	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 		<jsp:doBody />
@@ -144,19 +144,21 @@
 			}
 			
 			$(document).ready(function() {
-				var showControlBar = true;
+				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
-				if ( window.frameElement ) { // parallel
+				if ( window.name.match("LearnerActivity") || window.parent.name.match("LearnerActivity")) { 
+					// popup window
+					showControlBar = 0;
+					showIM = false;
+				} else 	if ( window.frameElement ) { // parallel
 					var myId = window.frameElement.id;
 					if ( myId ) {
 						if ( myId == 'lamsDynamicFrame0' ) {
 							showIM = false;
-						} else if ( myId == 'lamsDynamicFrame1' ) {
-							showControlBar = false;
+						} else if ( myId == 'lamsDynamicFrame1') {
+							showControlBar = 2;
 						}
 					}
-				} else { // test for popup window
-					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
 				if ( lessonId != "" || toolSessionId != "" ) {
@@ -173,11 +175,13 @@
 							
 							lessonId = result.lessonID;
 							
-							if ( showControlBar ) {
+							if ( showControlBar == 1  ) {
 								allowRestart = result.allowRestart;
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
+							} else if ( showControlBar == 2 ) {
+								$('#navcontent').addClass('navcontent');
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -233,7 +237,7 @@
 	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
 
 		<div id="navcontent" class="content">
-			<div class="row no-gutter">
+			<div class="row no-gutter no-margin">
 			<div class="col-xs-12">
 			<div class="container">
 				<c:choose>
@@ -276,7 +280,7 @@
 
 	<c:otherwise>
 	<!-- Standard Screens  --> 
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re0cc783b7adfa26b09769d31919df41b66852f02 -r1c254cdb23e07d238a56bb87b88a72835d8ce867
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e0cc783b7adfa26b09769d31919df41b66852f02)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1c254cdb23e07d238a56bb87b88a72835d8ce867)
@@ -19,7 +19,7 @@
 
 	<c:when test='${type == "navbar"}'>
 	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 		<jsp:doBody />
@@ -144,19 +144,21 @@
 			}
 			
 			$(document).ready(function() {
-				var showControlBar = true;
+				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
-				if ( window.frameElement ) { // parallel
+				if ( window.name.match("LearnerActivity") || window.parent.name.match("LearnerActivity")) { 
+					// popup window
+					showControlBar = 0;
+					showIM = false;
+				} else 	if ( window.frameElement ) { // parallel
 					var myId = window.frameElement.id;
 					if ( myId ) {
 						if ( myId == 'lamsDynamicFrame0' ) {
 							showIM = false;
-						} else if ( myId == 'lamsDynamicFrame1' ) {
-							showControlBar = false;
+						} else if ( myId == 'lamsDynamicFrame1') {
+							showControlBar = 2;
 						}
 					}
-				} else { // test for popup window
-					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
 				if ( lessonId != "" || toolSessionId != "" ) {
@@ -173,11 +175,13 @@
 							
 							lessonId = result.lessonID;
 							
-							if ( showControlBar ) {
+							if ( showControlBar == 1  ) {
 								allowRestart = result.allowRestart;
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
+							} else if ( showControlBar == 2 ) {
+								$('#navcontent').addClass('navcontent');
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -233,7 +237,7 @@
 	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
 
 		<div id="navcontent" class="content">
-			<div class="row no-gutter">
+			<div class="row no-gutter no-margin">
 			<div class="col-xs-12">
 			<div class="container">
 				<c:choose>
@@ -276,7 +280,7 @@
 
 	<c:otherwise>
 	<!-- Standard Screens  --> 
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re0cc783b7adfa26b09769d31919df41b66852f02 -r1c254cdb23e07d238a56bb87b88a72835d8ce867
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e0cc783b7adfa26b09769d31919df41b66852f02)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1c254cdb23e07d238a56bb87b88a72835d8ce867)
@@ -19,7 +19,7 @@
 
 	<c:when test='${type == "navbar"}'>
 	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 		<jsp:doBody />
@@ -144,19 +144,21 @@
 			}
 			
 			$(document).ready(function() {
-				var showControlBar = true;
+				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
-				if ( window.frameElement ) { // parallel
+				if ( window.name.match("LearnerActivity") || window.parent.name.match("LearnerActivity")) { 
+					// popup window
+					showControlBar = 0;
+					showIM = false;
+				} else 	if ( window.frameElement ) { // parallel
 					var myId = window.frameElement.id;
 					if ( myId ) {
 						if ( myId == 'lamsDynamicFrame0' ) {
 							showIM = false;
-						} else if ( myId == 'lamsDynamicFrame1' ) {
-							showControlBar = false;
+						} else if ( myId == 'lamsDynamicFrame1') {
+							showControlBar = 2;
 						}
 					}
-				} else { // test for popup window
-					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
 				if ( lessonId != "" || toolSessionId != "" ) {
@@ -173,11 +175,13 @@
 							
 							lessonId = result.lessonID;
 							
-							if ( showControlBar ) {
+							if ( showControlBar == 1  ) {
 								allowRestart = result.allowRestart;
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
+							} else if ( showControlBar == 2 ) {
+								$('#navcontent').addClass('navcontent');
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -233,7 +237,7 @@
 	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
 
 		<div id="navcontent" class="content">
-			<div class="row no-gutter">
+			<div class="row no-gutter no-margin">
 			<div class="col-xs-12">
 			<div class="container">
 				<c:choose>
@@ -276,7 +280,7 @@
 
 	<c:otherwise>
 	<!-- Standard Screens  --> 
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re0cc783b7adfa26b09769d31919df41b66852f02 -r1c254cdb23e07d238a56bb87b88a72835d8ce867
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e0cc783b7adfa26b09769d31919df41b66852f02)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1c254cdb23e07d238a56bb87b88a72835d8ce867)
@@ -19,7 +19,7 @@
 
 	<c:when test='${type == "navbar"}'>
 	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 		<jsp:doBody />
@@ -144,19 +144,21 @@
 			}
 			
 			$(document).ready(function() {
-				var showControlBar = true;
+				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
-				if ( window.frameElement ) { // parallel
+				if ( window.name.match("LearnerActivity") || window.parent.name.match("LearnerActivity")) { 
+					// popup window
+					showControlBar = 0;
+					showIM = false;
+				} else 	if ( window.frameElement ) { // parallel
 					var myId = window.frameElement.id;
 					if ( myId ) {
 						if ( myId == 'lamsDynamicFrame0' ) {
 							showIM = false;
-						} else if ( myId == 'lamsDynamicFrame1' ) {
-							showControlBar = false;
+						} else if ( myId == 'lamsDynamicFrame1') {
+							showControlBar = 2;
 						}
 					}
-				} else { // test for popup window
-					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
 				if ( lessonId != "" || toolSessionId != "" ) {
@@ -173,11 +175,13 @@
 							
 							lessonId = result.lessonID;
 							
-							if ( showControlBar ) {
+							if ( showControlBar == 1  ) {
 								allowRestart = result.allowRestart;
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
+							} else if ( showControlBar == 2 ) {
+								$('#navcontent').addClass('navcontent');
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -233,7 +237,7 @@
 	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
 
 		<div id="navcontent" class="content">
-			<div class="row no-gutter">
+			<div class="row no-gutter no-margin">
 			<div class="col-xs-12">
 			<div class="container">
 				<c:choose>
@@ -276,7 +280,7 @@
 
 	<c:otherwise>
 	<!-- Standard Screens  --> 
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 
Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re0cc783b7adfa26b09769d31919df41b66852f02 -r1c254cdb23e07d238a56bb87b88a72835d8ce867
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e0cc783b7adfa26b09769d31919df41b66852f02)
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1c254cdb23e07d238a56bb87b88a72835d8ce867)
@@ -19,7 +19,7 @@
 
 	<c:when test='${type == "navbar"}'>
 	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 		<jsp:doBody />
@@ -144,19 +144,21 @@
 			}
 			
 			$(document).ready(function() {
-				var showControlBar = true;
+				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
-				if ( window.frameElement ) { // parallel
+				if ( window.name.match("LearnerActivity") || window.parent.name.match("LearnerActivity")) { 
+					// popup window
+					showControlBar = 0;
+					showIM = false;
+				} else 	if ( window.frameElement ) { // parallel
 					var myId = window.frameElement.id;
 					if ( myId ) {
 						if ( myId == 'lamsDynamicFrame0' ) {
 							showIM = false;
-						} else if ( myId == 'lamsDynamicFrame1' ) {
-							showControlBar = false;
+						} else if ( myId == 'lamsDynamicFrame1') {
+							showControlBar = 2;
 						}
 					}
-				} else { // test for popup window
-					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
 				if ( lessonId != "" || toolSessionId != "" ) {
@@ -173,11 +175,13 @@
 							
 							lessonId = result.lessonID;
 							
-							if ( showControlBar ) {
+							if ( showControlBar == 1  ) {
 								allowRestart = result.allowRestart;
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
+							} else if ( showControlBar == 2 ) {
+								$('#navcontent').addClass('navcontent');
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -233,7 +237,7 @@
 	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
 
 		<div id="navcontent" class="content">
-			<div class="row no-gutter">
+			<div class="row no-gutter no-margin">
 			<div class="col-xs-12">
 			<div class="container">
 				<c:choose>
@@ -276,7 +280,7 @@
 
 	<c:otherwise>
 	<!-- Standard Screens  --> 
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re0cc783b7adfa26b09769d31919df41b66852f02 -r1c254cdb23e07d238a56bb87b88a72835d8ce867
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e0cc783b7adfa26b09769d31919df41b66852f02)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1c254cdb23e07d238a56bb87b88a72835d8ce867)
@@ -19,7 +19,7 @@
 
 	<c:when test='${type == "navbar"}'>
 	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 		<jsp:doBody />
@@ -144,19 +144,21 @@
 			}
 			
 			$(document).ready(function() {
-				var showControlBar = true;
+				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
-				if ( window.frameElement ) { // parallel
+				if ( window.name.match("LearnerActivity") || window.parent.name.match("LearnerActivity")) { 
+					// popup window
+					showControlBar = 0;
+					showIM = false;
+				} else 	if ( window.frameElement ) { // parallel
 					var myId = window.frameElement.id;
 					if ( myId ) {
 						if ( myId == 'lamsDynamicFrame0' ) {
 							showIM = false;
-						} else if ( myId == 'lamsDynamicFrame1' ) {
-							showControlBar = false;
+						} else if ( myId == 'lamsDynamicFrame1') {
+							showControlBar = 2;
 						}
 					}
-				} else { // test for popup window
-					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
 				if ( lessonId != "" || toolSessionId != "" ) {
@@ -173,11 +175,13 @@
 							
 							lessonId = result.lessonID;
 							
-							if ( showControlBar ) {
+							if ( showControlBar == 1  ) {
 								allowRestart = result.allowRestart;
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
+							} else if ( showControlBar == 2 ) {
+								$('#navcontent').addClass('navcontent');
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -233,7 +237,7 @@
 	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
 
 		<div id="navcontent" class="content">
-			<div class="row no-gutter">
+			<div class="row no-gutter no-margin">
 			<div class="col-xs-12">
 			<div class="container">
 				<c:choose>
@@ -276,7 +280,7 @@
 
 	<c:otherwise>
 	<!-- Standard Screens  --> 
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re0cc783b7adfa26b09769d31919df41b66852f02 -r1c254cdb23e07d238a56bb87b88a72835d8ce867
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e0cc783b7adfa26b09769d31919df41b66852f02)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1c254cdb23e07d238a56bb87b88a72835d8ce867)
@@ -19,7 +19,7 @@
 
 	<c:when test='${type == "navbar"}'>
 	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">
 		<jsp:doBody />
@@ -144,19 +144,21 @@
 			}
 			
 			$(document).ready(function() {
-				var showControlBar = true;
+				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
-				if ( window.frameElement ) { // parallel
+				if ( window.name.match("LearnerActivity") || window.parent.name.match("LearnerActivity")) { 
+					// popup window
+					showControlBar = 0;
+					showIM = false;
+				} else 	if ( window.frameElement ) { // parallel
 					var myId = window.frameElement.id;
 					if ( myId ) {
 						if ( myId == 'lamsDynamicFrame0' ) {
 							showIM = false;
-						} else if ( myId == 'lamsDynamicFrame1' ) {
-							showControlBar = false;
+						} else if ( myId == 'lamsDynamicFrame1') {
+							showControlBar = 2;
 						}
 					}
-				} else { // test for popup window
-					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
 				if ( lessonId != "" || toolSessionId != "" ) {
@@ -173,11 +175,13 @@
 							
 							lessonId = result.lessonID;
 							
-							if ( showControlBar ) {
+							if ( showControlBar == 1  ) {
 								allowRestart = result.allowRestart;
 								$('.lessonName').html(result.title);
 								fillProgressBar('learnerMainBar');
 								$('#navcontent').addClass('navcontent');
+							} else if ( showControlBar == 2 ) {
+								$('#navcontent').addClass('navcontent');
 							}
 							
 							var presenceEnabledPatch = result.presenceEnabledPatch;
@@ -233,7 +237,7 @@
 	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
 
 		<div id="navcontent" class="content">
-			<div class="row no-gutter">
+			<div class="row no-gutter no-margin">
 			<div class="col-xs-12">
 			<div class="container">
 				<c:choose>
@@ -276,7 +280,7 @@
 
 	<c:otherwise>
 	<!-- Standard Screens  --> 
-		<div class="row no-gutter">
+		<div class="row no-gutter no-margin">
 		<div class="col-xs-12">
 		<div class="container" id="content">