Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_admin/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:22:34 -0000	1.1.2.7
+++ lams_admin/web/WEB-INF/tags/Page.tag	8 Aug 2016 11:41:22 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.12 -r1.1.2.13
--- lams_central/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:23:57 -0000	1.1.2.12
+++ lams_central/web/WEB-INF/tags/Page.tag	8 Aug 2016 11:42:36 -0000	1.1.2.13
@@ -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/css/defaultHTML_learner.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_learner.css,v
diff -u -r1.32.2.26 -r1.32.2.27
--- lams_central/web/css/defaultHTML_learner.css	5 Aug 2016 12:23:56 -0000	1.32.2.26
+++ lams_central/web/css/defaultHTML_learner.css	8 Aug 2016 11:35:33 -0000	1.32.2.27
@@ -68,6 +68,11 @@
 .clear-both {
 	clear: both;
 }
+/* Eliminate the scrollbar on learner popup windows, monitoring windows */
+.no-margin{
+	margin-left: 0px;
+	margin-right: 0px;
+}
 /* Comments/Forum classes */
 .msg .panel-heading {
   padding: 3px;
@@ -324,7 +329,7 @@
 	width: 100%;
 }
 #criterias-table {
-	margin-left: 0;
+	margin-left: 0px;
 }
 #criterias-table td {
 	vertical-align:middle;
@@ -339,11 +344,11 @@
 	.navcontent{
 		position: absolute;
 		width: calc(100% - 40px); /*keeps 100% minus nav size*/
-		margin-left: 40px;
+		margin-left: 20px;
 		float: right;
 		min-height:100%;
 	}
-
+	
 	/* darker outline than usual */
 	nav.sidebar{
 		  border-radius: 0px;
@@ -433,6 +438,7 @@
 	nav.sidebar .fa{
 		font-size: 18px;
 	}
+	
 }
 
 /* .....NavBar: Fully showing nav bar..... */
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_learning/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:25:48 -0000	1.1.2.8
+++ lams_learning/web/WEB-INF/tags/Page.tag	8 Aug 2016 11:43:08 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_monitoring/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:25:49 -0000	1.1.2.7
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	8 Aug 2016 11:43:10 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:25:50 -0000	1.1.2.9
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	8 Aug 2016 11:43:11 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.10 -r1.1.2.11
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:25:51 -0000	1.1.2.10
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	8 Aug 2016 11:43:07 -0000	1.1.2.11
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.10 -r1.1.2.11
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:25:52 -0000	1.1.2.10
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	8 Aug 2016 11:43:09 -0000	1.1.2.11
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	5 Aug 2016 12:26:08 -0000	1.1.2.9
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	8 Aug 2016 11:43:06 -0000	1.1.2.10
@@ -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">