Index: lams_central/web/groupHeader.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b
--- lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
@@ -4,75 +4,78 @@
 <c:if test="${not empty org.moreLinks}">
 	<!-- bootstrap More options dropdown -->
 	<div class="course-right-buttons pull-right">
-	<div class="btn-group">
-	  <button type="button" class="btn btn-primary btn-sm dropdown-toggle ${addTourClass?'tour-more-options':''}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-fw fa-sliders" title="<fmt:message key="index.moreActions" />"></i> <span class="hidden-xs"><fmt:message key="index.moreActions" /></span> <span class="caret"></span></button>
-	  <ul id="more-links-menu" class="dropdown-menu">
-		<c:forEach var="link" items="${org.moreLinks}">
-			 <li onClick="${link.url}"
-	                      <c:if test="${not empty link.tooltip}">
-	                          title="<fmt:message key='${link.tooltip}'/>"
-	                      </c:if>
-	         >
-             	<a href="#"><i class="${link.style}"></i> <fmt:message key="${link.name}" /></a>
-             </li>
-        </c:forEach>
-  	 </ul>
+	 	<button type="button" class="btn btn-light btn-sm ${addTourClass?'tour-more-options':''}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+			<i class="fa fa-lg fa-cog" title="<fmt:message key="index.moreActions" />"></i> 
+	  		<span class="caret"></span>
+	  	</button>
+	    <div id="more-links-menu" class="dropdown-menu dropdown-menu-right">
+			<c:forEach var="link" items="${org.moreLinks}">
+				 <button class="dropdown-item" type="button" onClick="${link.url}"
+		         	<c:if test="${not empty link.tooltip}">
+		            	title="<fmt:message key='${link.tooltip}'/>"
+		         	</c:if>
+		         >
+	             	<i class="${link.style}"></i> <fmt:message key="${link.name}" />
+	             </button>
+	        </c:forEach>
+  	   </div>
 	</div>
-	</div>
 	<!-- end bootstrap More options dropdown -->
 </c:if> 
 
 <c:forEach var="link" items="${org.links}">
 	<c:choose>
 		<c:when test="${link.name eq 'index.addlesson.single'}">
 			<div class="course-right-buttons pull-right">
-				<div class="btn-group" role="group">
-					<button onClick="<c:out value='${link.url}'/>" type="button" class="btn btn-primary btn-sm ${addTourClass?'tour-add-lesson':''}">
+				<div class="btn-group">
+					<button onClick="<c:out value='${link.url}'/>" type="button" class="btn btn-light btn-sm ${addTourClass?'tour-add-lesson':''}">
 						<i class="${link.style}" title="<fmt:message key="index.addlesson" />"></i>
 						<span class="hidden-xs"><fmt:message key="index.addlesson" /></span>
 					</button>
-					<div class="btn-group" role="group">
-						<button id="addSingleActivityLessonDrop" type="button" class="btn btn-primary btn-sm dropdown-toggle ${addTourClass?'tour-add-single-lesson':''}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-							<span class="caret"></span>
-						</button>
-						<ul class="dropdown-menu" aria-labelledby="openDropButton">
-						 	<li class="dropdown-header"><fmt:message key="index.single.activity.lesson.desc" /></li>
-							<c:forEach var="tool" items="${tools}">
-							        <li onClick="javascript:showAddSingleActivityLessonDialog(${org.id}, ${tool.toolId}, ${tool.learningLibraryId})">
-							        	<a href="#"><c:out value="${tool.toolDisplayName}" /></a>
-							        </li>
-							</c:forEach>
-						</ul>
+					
+					<button type="button" class="btn btn-light btn-sm dropdown-toggle dropdown-toggle-split ${addTourClass?'tour-add-single-lesson':''}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-display="static">
+						<span class="caret"></span>
+					</button>
+					<div class="dropdown-menu dropdown-menu-right">
+						<h6 class="dropdown-header">
+							<fmt:message key="index.single.activity.lesson.desc" />
+						</h6>
+						<c:forEach var="tool" items="${tools}">
+							<button class="dropdown-item" type="button" onClick="javascript:showAddSingleActivityLessonDialog(${org.id}, ${tool.toolId}, ${tool.learningLibraryId})">
+						        <c:out value="${tool.toolDisplayName}" />
+						    </button>
+						</c:forEach>
 					</div>
 				</div>
 			</div>
 		</c:when>
+		
 		<c:when test="${link.name eq 'index.kumalive.teacher'}">
 			<div class="course-right-buttons pull-right">
-				<div class="btn-group" role="group" title="<fmt:message key="${link.tooltip}" />">
-					<button onClick="<c:out value='${link.url}'/>" type="button" class="btn btn-primary btn-sm">
+				<div class="btn-group" title="<fmt:message key="${link.tooltip}" />">
+					<button onClick="<c:out value='${link.url}'/>" type="button" class="btn btn-light btn-sm">
 						<i class="${link.style}"></i>
 						<span class="hidden-xs"><fmt:message key="index.kumalive" /></span>
 					</button>
-					<div class="btn-group" role="group">
-						<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-							<span class="caret"></span>
+					
+					<button type="button" class="btn btn-light btn-sm dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-display="static">
+						<span class="caret"></span>
+					</button>
+					<div class="dropdown-menu dropdown-menu-right">
+						<button class="dropdown-item" type="button" onClick="javascript:openKumalive(${org.id}, 'learner')">
+							<fmt:message key="index.kumalive.enter.learner" />
 						</button>
-						<ul class="dropdown-menu">
-						 	<li onClick="javascript:openKumalive(${org.id}, 'learner')">
-						 		<a href="#"><fmt:message key="index.kumalive.enter.learner" /></a>
-						 	</li>
-						 	<li onClick="javascript:showKumaliveReportDialog(${org.id})">
-						 		<a href="#"><fmt:message key="index.kumalive.report" /></a>
-						 	</li>
-						 	<li onClick="javascript:showKumaliveRubricsDialog(${org.id})">
-						 		<a href="#"><fmt:message key="index.kumalive.rubric" /></a>
-						 	</li>
-						</ul>
+						<button class="dropdown-item" type="button" onClick="javascript:showKumaliveReportDialog(${org.id})">
+						 	<fmt:message key="index.kumalive.report" />
+						</button>
+						<button class="dropdown-item" type="button" onClick="javascript:showKumaliveRubricsDialog(${org.id})">
+						 	<fmt:message key="index.kumalive.rubric" />
+						</button>
 					</div>
 				</div>
 			</div>
 		</c:when>
+		
 		<c:when test="${link.name eq 'index.kumalive'}">
 			<div class="course-right-buttons pull-right">
                  <c:choose>
@@ -96,16 +99,17 @@
 				</a>
 			</div>
 		</c:when>
+		
 		<c:otherwise>
 			<div class="course-right-buttons pull-right">
-				<a class="btn btn-primary btn-sm tour-${link.id}" onClick="<c:out value='${link.url}'/>"
+				<button class="btn btn-light btn-sm tour-${link.id}" onClick="<c:out value='${link.url}'/>"
                      <c:if test="${not empty link.tooltip}">
                      	title="<fmt:message key='${link.tooltip}'/>"
                  	</c:if>
                 >
 					<i class="${link.style}" title="<fmt:message key="${link.name}" />"></i>
 					<span class="hidden-xs"><fmt:message key="${link.name}" /></span>
-				</a>
+				</button>
 			</div>
 		</c:otherwise>
 	</c:choose>