Index: lams_central/web/groupHeader.jsp
===================================================================
diff -u -r4f284603a74199f14d9eb0d5e1cc04b89755ba31 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision 4f284603a74199f14d9eb0d5e1cc04b89755ba31)
+++ lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -1,54 +1,69 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
+
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="row">
-	<div class="mycourses-left-buttons">
-		<h2><span class="j-group-icon" style="vertical-align:middle;"></span>&nbsp;<a class="j-group-header"><c:out value="${orgBean.name}" /></a>
-			<c:if test="${not empty orgBean.archivedDate}"><small>(<fmt:message key="label.archived"/> <lams:Date value="${orgBean.archivedDate}"/>)</small></c:if>
-		</h2>
-	</div>
-
 <!-- Add More menu drop down first (if it contains links) -->
-<c:if test="${not empty orgBean.moreLinks}">
+<c:if test="${not empty org.moreLinks}">
 	<div class="mycourses-right-buttons">
-		<a id="more-actions-button-${orgBean.id}" class="more-actions-button" href="javascript:return false;">
-			<fmt:message key="index.moreActions" />
-		</a>
+		<div class="split-ui-button">
+			<div>
+				<span class="more-actions-button"><fmt:message key="index.moreActions" /></span>
+			</div>
+			<div>&nbsp;</div>
+		</div>
+		<ul>
+			<c:forEach var="link" items="${org.moreLinks}">
+				<li>
+					<a class="${link.style}" href="${link.url}"
+						<c:if test="${not empty link.tooltip}">
+                			title="<fmt:message key='${link.tooltip}'/>"
+                		</c:if>
+                	>
+						<fmt:message key="${link.name}" />
+					</a>
+				</li>
+			</c:forEach>
+		</ul>
 	</div>
 </c:if> 
 
-	<c:forEach var="link" items="${orgBean.links}">
-		<c:set var="tooltip" value="" />
-		<c:if test="${link.tooltip ne null}">
-			<c:set var="tooltip">
-				<fmt:message key="${link.tooltip}" />
-			</c:set>
-		</c:if>
-		
-		<div class="mycourses-right-buttons">
-			<a class="<c:out value='${link.style}'/>" href="<c:out value='${link.url}'/>" title="${tooltip}"> 
-				<fmt:message key="${link.name}" /> 
-			</a>
-		</div>	
-	</c:forEach>
-</div>
-
-<div>
-	<ul id="more-actions-list-${orgBean.id}" class="more-actions-list">
-		<c:forEach var="link" items="${orgBean.moreLinks}">
-			<c:set var="tooltip" value="" />
-			<c:if test="${link.tooltip ne null}">
-				<c:set var="tooltip">
-					<fmt:message key="${link.tooltip}" />
-				</c:set>
-			</c:if>
-			<li>
-				<a class="${link.style}" href="${link.url}" title="${tooltip}">
-					<fmt:message key="${link.name}" />
-				</a>
-			</li>
-		</c:forEach>
-	</ul>
-</div>
+<c:forEach var="link" items="${org.links}">
+	<c:choose>
+		<c:when test="${link.name eq 'index.addlesson.single'}">
+			<div class="mycourses-right-buttons">
+				<div class="split-ui-button">
+					<div onClick="<c:out value='${link.url}'/>"
+						<c:if test="${not empty link.tooltip}">
+		                	title="<fmt:message key='${link.tooltip}'/>"
+		                </c:if>
+		            >
+						<span class="${link.style}"><fmt:message key="index.addlesson" /></span>
+					</div>
+					<div>&nbsp;</div>
+				</div>
+				<ul>
+					<span><fmt:message key="index.single.activity.lesson.desc" /></span>
+					<c:forEach var="tool" items="${tools}">
+						<li>
+							<a href="#" onClick="javascript:showAddSingleActivityLessonDialog(${org.id}, ${tool.toolId})">
+								<c:out value="${tool.toolDisplayName}" />
+							</a>
+						</li>
+					</c:forEach>
+				</ul>
+			</div>
+		</c:when>
+		<c:otherwise>
+			<div class="mycourses-right-buttons">
+				<div class="ui-button" onClick="<c:out value='${link.url}'/>"
+					<c:if test="${not empty link.tooltip}">
+				        title="<fmt:message key='${link.tooltip}'/>"
+				    </c:if>
+				>
+					<span class="${link.style}"><fmt:message key="${link.name}" /></span>
+				</div>
+			</div>
+		</c:otherwise>
+	</c:choose>
+</c:forEach>
\ No newline at end of file