Index: lams_central/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rd3c9d3f03c16e8f7025d7b2bfe84e68af4fc0746 -r98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09
--- lams_central/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision d3c9d3f03c16e8f7025d7b2bfe84e68af4fc0746)
+++ lams_central/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09)
@@ -24,16 +24,16 @@
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
 
-<p class="small-space-top">
+<p class="voffset5">
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
 		styleClass="noBorder" styleId="${allowCommentsVariableName}">
 		&nbsp;<fmt:message key="${allowCommentLabelKey}" />
 	</html:checkbox>
 </p>
 	<div style="padding-left: 20px" id="likedislike">
 	<p>
-		<html:radio property="${likeDislikeVariableName}" value="false" /><fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<html:radio property="${likeDislikeVariableName}" value="true" /><fmt:message key="${likeDislikeLabelKey}" /> 
+		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 	</p>
 	</div>
 
Index: lams_central/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rfef442a88ab05c91db8a551081c4abc060d4da5e -r98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09
--- lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision fef442a88ab05c91db8a551081c4abc060d4da5e)
+++ lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09)
@@ -1,6 +1,6 @@
 
 <%
-	 /****************************************************************
+	/****************************************************************
 	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 	 * =============================================================
 	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -49,10 +49,18 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<p>
-	<fmt:message key="${defineLaterMessageKey}" />
-</p>
-<div align="right" class="space-bottom-top">
-	<a href="javascript:location.reload(true);" class="button"><fmt:message
-			key="${buttonTryAgainKey}" /> </a>
+<div class="row no-gutter">
+	<div
+		class="col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
+		<div class="alert alert-info">
+			<fmt:message key="${defineLaterMessageKey}" />
+		</div>
+	</div>
 </div>
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<a href="javascript:location.reload(true);"
+			class="btn btn-primary pull-right voffset5"><fmt:message
+				key="${buttonTryAgainKey}" /></a>
+	</div>
+</div>
\ No newline at end of file
Fisheye: Tag 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tags/HybridTab.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tags/HybridTabAction.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tags/HybridTabBody.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tags/HybridTabHeader.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r268809b34d41cef37fc1cbacc9aa0d2eeb245377 -r98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09
--- lams_central/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 268809b34d41cef37fc1cbacc9aa0d2eeb245377)
+++ lams_central/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09)
@@ -24,8 +24,8 @@
 
 	/**
 	 * Tab.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates a tab element.
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates a tab element within the Hybrid Tab Header.
 	 * Wiki: 
 	 */
 %>
@@ -34,7 +34,7 @@
 <%@ attribute name="value" required="false" rtexprvalue="true"%>
 <%@ attribute name="key" required="false" rtexprvalue="true"%>
 <%@ attribute name="inactive" required="false" rtexprvalue="true"%>
-<%@ attribute name="methodCall" required="false" rtexprvalue="true"%> 
+<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
Index: lams_central/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/TabBodyArea.tag	(revision 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09)
@@ -0,0 +1,39 @@
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBodyArea.tag
+ *	Author: Fiona Malikoff
+ *	Description: Creates the panel body area for a nav bar screen
+ * Wiki: 
+ */
+
+%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<div class="panel-body panel-monitor-body">
+	 <jsp:doBody />
+</div>
+
+</div> <!--  close tab opened in TabHeader -->
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r268809b34d41cef37fc1cbacc9aa0d2eeb245377 -r98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09
--- lams_central/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 268809b34d41cef37fc1cbacc9aa0d2eeb245377)
+++ lams_central/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09)
@@ -23,52 +23,70 @@
 
 /**
  * Tabs.tag
- *	Author: Mitchell Seaton
- *	Description: Create a tab list from a input collection or nested Tab tags.
- * Wiki: 
+ *	Author: Fiona Malikoff
+ *	Description: Create a hybrid panel header that contains a nav bar that acts like tabs.
  */
 
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
+%>
 <%@ attribute name="control" required="false" rtexprvalue="true"%>
-<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="format" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpModule" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+
+<c:set var="useActions" value="false" scope="request" />
+<c:if test="${not empty helpToolSignature or not empty helpModule or not empty refreshOnClickAction or not empty extraControl}">
+	<c:set var="useActions" value="true" scope="request" />
+</c:if>
+
 <c:set var="dControl" value="false" scope="request" />
 <c:if test="${control}">
 	<c:set var="dControl" value="${control}" scope="request" />
 </c:if>
-<c:choose>
-<c:when test="${empty format}">
-	<c:set var="dFormat" value="nav-tabs" scope="request" />
-</c:when>
-<c:otherwise>
-	<c:set var="dFormat" value="${format}" scope="request" />
-</c:otherwise>
-</c:choose>
 
-<!-- tab holder table -->
-<ul id="page-tabs" class="nav ${dFormat}" role="tablist">
-	<jsp:doBody />
-</ul>
+<!-- navbar combined with tabs -->
+<div class="panel panel-default panel-monitor-page">
+<div class="panel-heading navbar-heading">
 
-<%--
-	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-	this is handy if the page needs different logic on initialisation and user switching tabs
-	
-	-- 			onclick="${methodCall}(${id});return false;">
-	
---%>
-
-<c:if test="${methodCall == null}">
-	<c:choose>
-		<c:when test="${dControl}">
-			<c:set var="methodCall" value="doSelectTab" />
-		</c:when>
-		<c:otherwise>
-			<c:set var="methodCall" value="selectTab" />
-		</c:otherwise>
-	</c:choose>
-</c:if>
+ 	<nav class="navbar navbar-default navbar-heading">
+	<div class="container-fluid">
+    	<!-- Brand and toggle get grouped for better mobile display -->
+		<div class="navbar-header">
+	      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
+	        <span class="sr-only">Toggle navigation</span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	      </button>
+	      <span class="navbar-brand">${title}</span>
+		</div>
+		<div class="collapse navbar-collapse" id="navbar-collapse-1" role="navigation">
+         <ul class="nav navbar-nav" id="page-tabs">
+	         <li role="separator" class="divider"></li>
+	          <jsp:doBody />
+         </ul>
+         <c:if test="${useActions}">
+         <ul class="nav navbar-nav navbar-right" id="page-actions">
+		     <li role="separator" class="divider"></li>
+		     <c:if test="${not empty refreshOnClickAction}">
+             <li class="navbar-text" ><span onclick="${refreshOnClickAction}"><i class="fa fa-refresh"></i></span></li>
+             </c:if>
+             <c:if test="${not empty helpToolSignature or not empty helpModule}">
+             <li class="navbar-text" ><lams:help toolSignature="${helpToolSignature}" module="${helpModule}" style="small"/></li>
+             </c:if>
+             <c:if test="${not empty extraControl}">
+             <li class="navbar-text" >${extraControl}</li>
+             </c:if>
+         </ul>
+         </c:if>
+ 	    
+ 		</div>
+	 </div>
+     </nav>
+     <!-- /top nav -->
+</div>
+<!-- panel div closed by TabBodyArea -->
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -r98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09
--- lams_central/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_central/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09)
@@ -41,7 +41,9 @@
 	<lams:WebAppURL />
 </c:set>
 
-<lams:css style="main"/>
+<lams:css/>
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r268809b34d41cef37fc1cbacc9aa0d2eeb245377 -r98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 268809b34d41cef37fc1cbacc9aa0d2eeb245377)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09)
@@ -416,6 +416,10 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>CKEditor</name>
        <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
@@ -452,18 +456,6 @@
 		<path>/WEB-INF/tags/Arrow.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>HybridTab</name>
-       <path>/WEB-INF/tags/HybridTab.tag</path>
-   	</tag-file>
-   	<tag-file>
-       <name>HybridTabHeader</name>
-       <path>/WEB-INF/tags/HybridTabHeader.tag</path>
-   	</tag-file>    
-   	<tag-file>
-       <name>HybridTabBody</name>
-       <path>/WEB-INF/tags/HybridTabBody.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AdvancedAccordian</name>
        <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>