Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r49b072598933566cedd795667351678071f03004 -rac26a838efe95d62b8cdb2a44f59fd029feb5f5b
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 49b072598933566cedd795667351678071f03004)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision ac26a838efe95d62b8cdb2a44f59fd029feb5f5b)
@@ -315,13 +315,6 @@
 	</servlet>
 
 	<servlet>
-		<servlet-name>GradebookServlet</servlet-name>
-		<servlet-class>
-			org.lamsfoundation.lams.web.GradebookServlet
-		</servlet-class>
-	</servlet>
-
-	<servlet>
 		<servlet-name>CourseGroupManager</servlet-name>
 		<servlet-class>
 			org.lamsfoundation.lams.web.OrganisationGroupServlet
@@ -444,11 +437,6 @@
 	</servlet-mapping>
 
 	<servlet-mapping>
-		<servlet-name>GradebookServlet</servlet-name>
-		<url-pattern>/services/Gradebook</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
 		<servlet-name>CourseGroupManager</servlet-name>
 		<url-pattern>/services/CourseGroupManager</url-pattern>
 	</servlet-mapping>
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
===================================================================
diff -u -r0aa9f13e05d384ced6793a22c6a72057c071fc42 -rac26a838efe95d62b8cdb2a44f59fd029feb5f5b
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java	(.../GradebookMonitoringController.java)	(revision 0aa9f13e05d384ced6793a22c6a72057c071fc42)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java	(.../GradebookMonitoringController.java)	(revision ac26a838efe95d62b8cdb2a44f59fd029feb5f5b)
@@ -129,8 +129,6 @@
 	    request.setAttribute("weights", weights);
 	}
 
-	request.setAttribute("isInTabs", WebUtil.readBooleanParam(request, "isInTabs", false));
-
 	return "gradebookMonitor";
     }
 
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -r59e208b2fd262829e189b4b1b8b6e1bbd0f3e143 -rac26a838efe95d62b8cdb2a44f59fd029feb5f5b
--- lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 59e208b2fd262829e189b4b1b8b6e1bbd0f3e143)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision ac26a838efe95d62b8cdb2a44f59fd029feb5f5b)
@@ -440,22 +440,20 @@
 			</fmt:message>
 		</h4>
 		
-		<c:set var="btnclass" value="btn btn-xs btn-default"/>
-
-		<a target="_blank" class="${btnclass} pull-right loffset5" title="<fmt:message key='button.help.tooltip'/>"
+		<a target="_blank" class="btn btn-xs btn-default pull-right loffset5" title="<fmt:message key='button.help.tooltip'/>"
 		   href="http://wiki.lamsfoundation.org/display/lamsdocs/Gradebook+Course+Monitor">
 			<i class="fa fa-question-circle"></i> <span class="hidden-xs"><fmt:message key="button.help"/></span>
 		</a>
 
 		<div id="datesNotShown">
-			<a class="${btnclass} pull-right btn-primary" href="javascript:toggleLessonDates()" title="<fmt:message key="gradebook.monitor.show.dates" />">
+			<a class="btn btn-xs btn-default pull-right btn-primary" href="javascript:toggleLessonDates()" title="<fmt:message key="gradebook.monitor.show.dates" />">
 				<i class="fa fa-calendar-check-o"></i> <span class="hidden-xs">
 				<fmt:message key="gradebook.monitor.show.dates" /></span>
 			</a>
 		</div>
 
 		<div id="datesShown" style="display:none">
-			<a class="${btnclass} pull-right btn-primary" href="javascript:toggleLessonDates()" title="<fmt:message key="gradebook.monitor.hide.dates" />">
+			<a class="btn btn-xs btn-default pull-right btn-primary" href="javascript:toggleLessonDates()" title="<fmt:message key="gradebook.monitor.hide.dates" />">
 				<i class="fa fa-calendar-check-o"></i> <span class="hidden-xs">
 				<fmt:message key="gradebook.monitor.hide.dates" /></span>
 			</a>
@@ -464,22 +462,22 @@
 
 		<div id="export-link-area" class="gbTopButtonsContainer">
 		<div>
-			<a href="#nogo" id="export-course-button" class="${btnclass}" title="<fmt:message key="gradebook.export.excel" />">
+			<a href="#nogo" id="export-course-button" class="btn btn-xs btn-default" title="<fmt:message key="gradebook.export.excel" />">
 				<i class="fa fa-download"></i><span class="hidden-xs">
 				<fmt:message key="gradebook.export.excel" />
 				</span>
 			</a>
 		</div>
 
 		<div id="selectLessonsNotShown">
-			<a class="${btnclass}" href="#nogo" onclick="return openSelectLessonsArea();" title="<fmt:message key="label.select.lessons.to.export" />" >
+			<a class="btn btn-xs btn-default" href="#nogo" onclick="return openSelectLessonsArea();" title="<fmt:message key="label.select.lessons.to.export" />" >
 				<i class="fa fa-square-o"></i><span class="hidden-xs">
 				<fmt:message key="label.select.lessons.to.export" />
 				</span>
 			</a>
 		</div>
 		<div id="selectLessonsShown" style="display:none">
-			<a class="${btnclass}" href="#nogo" onclick="return openSelectLessonsArea();" title="<fmt:message key="label.hide.lessons.to.export " />" >
+			<a class="btn btn-xs btn-default" href="#nogo" onclick="return openSelectLessonsArea();" title="<fmt:message key="label.hide.lessons.to.export " />" >
 				<i class="fa fa-square-o"></i><span class="hidden-xs">
 				<fmt:message key="label.hide.lessons.to.export" />
 				</span>
@@ -489,7 +487,7 @@
 		</div>
 
 		<div id="select-lessons-area" class="voffset5 form-inline">
-			<input class="${btnclass}" type="button" value="<fmt:message key="label.button.export"/>" id="export-selected-lessons-button" />
+			<input class="btn btn-xs btn-default" type="button" value="<fmt:message key="label.button.export"/>" id="export-selected-lessons-button" />
 			<div class="checkbox input-sm loffset5"><label><input type="checkbox" id="export-selected-simplified">&nbsp;<fmt:message key="label.simplified.export"/></label></div>
 			<div><fmt:message key="gradebook.export.desc"/></div>
 		</div>
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -r8eaff3948232f090f7dee5f7df1a4753b4c4a1e8 -rac26a838efe95d62b8cdb2a44f59fd029feb5f5b
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 8eaff3948232f090f7dee5f7df1a4753b4c4a1e8)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision ac26a838efe95d62b8cdb2a44f59fd029feb5f5b)
@@ -704,141 +704,80 @@
 
 <body class="stripes">
 
-	<!--  The buttons are formatted and dispayed differently in the pop up vs monitoring version. Popup matches Course Gradebook, 
-	-- Monitoring matches monitoring. So various button settings and the button codes are setup in advance and included where needed later.  -->
-	
-	<c:choose>
-	<c:when test="${!isInTabs}">
-		<c:set var="btnclass" value="btn btn-xs btn-default"/>
-	</c:when>
-	<c:otherwise>
-		<c:set var="btnclass" value="btn btn-sm btn-default"/>
-	</c:otherwise>
-	</c:choose>
-		
-	<c:set var="lockLabelClass">${isInTabs?"lockLabel":""}</c:set>
-	<c:set var="padlockCode">
+	<div class="gbTopButtonsContainer pull-left">
 		<div class="visible-xs-inline">
-		<div id="padlockLocked" style="display:none">
-			<span class="${lockLabelClass}">
-			<i class="fa fa-lock"></i>
-			<fmt:message key="label.marks"/>
-			</span>
+			<div id="padlockLocked" style="display:none">
+				<span class="lockLabel">
+				<i class="fa fa-lock"></i>
+				<fmt:message key="label.marks"/>
+				</span>
+			</div>
+			<div id="padlockUnlocked" style="display:none">
+				<span class="lockLabel">
+				<i class="fa fa-unlock"></i>
+				<fmt:message key="label.marks"/>
+				</span>
+			</div>
 		</div>
-		<div id="padlockUnlocked" style="display:none">
-			<span class="${lockLabelClass}">
-			<i class="fa fa-unlock"></i>
-			<fmt:message key="label.marks"/>
-			</span>
-		</div>
-		</div>
-	</c:set>
-			
-			
-	<c:set var="chartButtonCode">
-		<div id="tour-mark-chart-button">
-			<div id="markChartShown" style="display:none">
-			<a href="javascript:toggleMarkChart()" class="${btnclass}" title="<fmt:message key='label.hide.marks.chart'/>" >
-				<i class="fa fa-bar-chart"></i> <span class="hidden-xs">
-				<fmt:message key="label.hide.marks.chart"/>
+	</div>
+	
+	<div class="gbTopButtonsContainer pull-right" id="export-link-area">
+
+		<div>
+			<a href="#nogo" id="export-grades-button" class="btn btn-sm btn-default" title="<fmt:message key='gradebook.export.excel'/>" >
+				<i class="fa fa-download"></i><span id="exportSpan" class="hidden-xs">
+				<fmt:message key="gradebook.export.excel" />
 				</span>
 			</a> 
 		</div>
-		<div id="markChartHidden">
-			<a href="javascript:toggleMarkChart()" class="${btnclass}" title="<fmt:message key='label.show.marks.chart'/>" >
-				<i class="fa fa-bar-chart"></i> <span class="hidden-xs">
-				<fmt:message key="label.show.marks.chart"/>
+	
+		<div id="tour-release-marks">
+			<a href="javascript:toggleReleaseMarksPanel()" class="btn btn-sm btn-default" 
+				title="<fmt:message key="gradebook.monitor.releasemarks.toggle.panel.tooltip" />">
+				<i class="fa fa-share-alt "></i> <span class="hidden-xs">
+					<fmt:message key="gradebook.monitor.releasemarks.release" />
 				</span>
-			</a> 
+			</a>
 		</div>
+
+ 		<div id="tour-mark-chart-button">
+			<div id="markChartShown" style="display:none">
+				<a href="javascript:toggleMarkChart()" class="btn btn-sm btn-default" title="<fmt:message key='label.hide.marks.chart'/>" >
+					<i class="fa fa-bar-chart"></i> <span class="hidden-xs">
+					<fmt:message key="label.hide.marks.chart"/>
+					</span>
+				</a> 
+			</div>
+			<div id="markChartHidden">
+				<a href="javascript:toggleMarkChart()" class="btn btn-sm btn-default" title="<fmt:message key='label.show.marks.chart'/>" >
+					<i class="fa fa-bar-chart"></i> <span class="hidden-xs">
+					<fmt:message key="label.show.marks.chart"/>
+					</span>
+				</a> 
+			</div>
 		</div>
-	</c:set>
-	
-	<c:if test="${usesWeights}">
-		<c:set var="weightButtonCode">
+		
+ 		<c:if test="${usesWeights}">
 			<div id="tour-weight-button">
 				<div id="weightShown" style="display:none">
-				<a href="javascript:toggleWeight()" class="${btnclass}" title="<fmt:message key='label.button.hide.weights'/>" >
+				<a href="javascript:toggleWeight()" class="btn btn-sm btn-default" title="<fmt:message key='label.button.hide.weights'/>" >
 					<i class="fa fa-balance-scale"></i> <span class="hidden-xs">
 					<fmt:message key="label.button.hide.weights"/>
 					</span>
 				</a> 
 				</div>
 				<div id="weightHidden">
-					<a href="javascript:toggleWeight()" class="${btnclass}" title="<fmt:message key='label.button.show.weights'/>" >
+					<a href="javascript:toggleWeight()" class="btn btn-sm btn-default" title="<fmt:message key='label.button.show.weights'/>" >
 						<i class="fa fa-balance-scale"></i> <span class="hidden-xs">
 						<fmt:message key="label.button.show.weights"/>
 						</span>
 					</a> 
 				</div>
 			</div>
-		</c:set>
-	</c:if>
-	
-	<c:choose>
-		<c:when test="${!isInTabs}">
-			<%-- replacement for Page type admin --%>
-			<div class="row no-gutter no-margin">
-			<div class="col-xs-12">
-			<div class="container" id="content">
-	
-			<div class="panel panel-default panel-admin-page">
-			<div class="panel-body panel-admin-body">
-	
-			<h4><fmt:message key="gradebook.title.lessonGradebook">
-						<fmt:param>
-							<c:out value="${lessonDetails.lessonName}" escapeXml="true"/>
-						</fmt:param>
-					</fmt:message></h4>
-	
-			<div class="gbTopButtonsContainer pull-right">
-				${chartButtonCode}
-				${weightButtonCode}
-				<a target="_blank" class="${btnclass}" title="<fmt:message key='button.help.tooltip'/>"
-					   href="http://wiki.lamsfoundation.org/display/lamsdocs/Gradebook+Lesson+Marking">
-				<i class="fa fa-question-circle"></i> <span class="hidden-xs"><fmt:message key="button.help"/></span></a>
-			</div>
-	
-			<div class="gbTopButtonsContainer pull-left" id="export-link-area">
-				${padlockCode}
-			
-		</c:when>
-		
-		<c:otherwise>
-		 	
-			<div class="gbTopButtonsContainer pull-left">
-				${padlockCode}
-			</div>
-			
-			<div class="gbTopButtonsContainer pull-right" id="export-link-area">
-		 	
-		</c:otherwise>
-	</c:choose>
+		</c:if>
 
-				<div>
-					<a href="#nogo" id="export-grades-button" class="${btnclass}" title="<fmt:message key='gradebook.export.excel'/>" >
-						<i class="fa fa-download"></i><span id="exportSpan" class="hidden-xs">
-						<fmt:message key="gradebook.export.excel" />
-						</span>
-					</a> 
-				</div>
+	</div> <!-- Closes buttons -->
 			
-					<div id="tour-release-marks">
-					<a href="javascript:toggleReleaseMarksPanel()" class="${btnclass}" 
-						title="<fmt:message key="gradebook.monitor.releasemarks.toggle.panel.tooltip" />">
-						<i class="fa fa-share-alt "></i> <span class="hidden-xs">
-							<fmt:message key="gradebook.monitor.releasemarks.release" />
-						</span>
-					</a>
-				</div>
-
-				<c:if test="${isInTabs}">
-			 		${chartButtonCode}
-			 		${weightButtonCode}
-				</c:if>
-		
-			</div> <!-- Closes buttons -->
-			
 	<div class="row">
 		<div class="col-xs-12">
 			<div id="releaseMarksPanel"></div>
@@ -869,7 +808,7 @@
 						</c:if>
 						<div class="col-sm-4">${weightArray[0]}: ${weightArray[2]}</div>
 					</c:forEach>
-							</div> <%-- close off row started in the loop --%>
+					</div> <%-- close off row started in the loop --%>
 				</div>
 			</div>	
 		</div>	
@@ -885,14 +824,6 @@
 		<table id="activityView" class="scroll" ></table>
 		<div id="activityViewPager" class="scroll" ></div>
 	</div>
-	 
-	<c:if test="${!isInTabs}">
- 		</div>
- 		</div>
- 		</div>
-		</div>
-		</div>	
-	</c:if>
 
 </body>
 </lams:html>
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -rbb00a93afc4de53199b77c3a719814292958e53f -rac26a838efe95d62b8cdb2a44f59fd029feb5f5b
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision bb00a93afc4de53199b77c3a719814292958e53f)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision ac26a838efe95d62b8cdb2a44f59fd029feb5f5b)
@@ -2302,7 +2302,7 @@
  */
 function updateGradebookTab() {
 	$("#gradebookLoading").show();
-	$("#gradebookDiv").load(LAMS_URL + 'gradebook/gradebookMonitoring.do?isInTabs=true&lessonID=' + lessonId, function() {
+	$("#gradebookDiv").load(LAMS_URL + 'gradebook/gradebookMonitoring.do?lessonID=' + lessonId, function() {
 		  $("#gradebookLoading").hide();
 	});
 }