Index: lams_central/web/groupHeader.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r70e6fe3062072e2c6188217c562a4f33f0838604
--- lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/groupHeader.jsp	(.../groupHeader.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
@@ -9,7 +9,7 @@
 	<!-- 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>
+	  <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="d-none d-sm-inline"><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}"
@@ -33,7 +33,7 @@
 				<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':''}">
 						<i class="${link.style}" title="<fmt:message key="index.addlesson" />"></i>
-						<span class="hidden-xs"><fmt:message key="index.addlesson" /></span>
+						<span class="d-none d-sm-inline"><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">
@@ -56,7 +56,7 @@
 				<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">
 						<i class="${link.style}"></i>
-						<span class="hidden-xs"><fmt:message key="index.kumalive" /></span>
+						<span class="d-none d-sm-inline"><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">
@@ -96,20 +96,20 @@
                     </c:if>    
                 >
 					<i class="${link.style}" title="<fmt:message key="${link.name}" />"></i>
-					<span class="hidden-xs"><fmt:message key="${link.name}" /></span>
+					<span class="d-none d-sm-inline"><fmt:message key="${link.name}" /></span>
 				</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-primary btn-sm tour-${link.id}" onClick="<c:out value='${link.url}'/>"  type="button" 
                      <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>
+					<span class="d-none d-sm-inline"><fmt:message key="${link.name}" /></span>
+				</button>
 			</div>
 		</c:otherwise>
 	</c:choose>