Index: lams_learning/web/grouping/choose.jsp
===================================================================
diff -u -rfb44371b6225fdfe2cba7781170998ef034126ce -r5d896b9c108705c770d5294510f60ae9aa027f6d
--- lams_learning/web/grouping/choose.jsp	(.../choose.jsp)	(revision fb44371b6225fdfe2cba7781170998ef034126ce)
+++ lams_learning/web/grouping/choose.jsp	(.../choose.jsp)	(revision 5d896b9c108705c770d5294510f60ae9aa027f6d)
@@ -19,64 +19,56 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>		
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-function" prefix="fn" %>
-	
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-	<div id="content">
-		<h1><c:out value="${title}"/></h1>
-		<p>&nbsp;</p>
-		<p><fmt:message key="label.learner.choice.group.message"/></p>
-		
-		<table class="alternative-color" cellspacing="0">
+
+<lams:Page type="learner" title="${title}">
+
+	<div class="panel">
+		<fmt:message key="label.learner.choice.group.message" />
+	</div>
+
+	<div class="table-responsive">
+		<table class="table table-condensed table-hover">
 			<tr>
-				<th width="25%" class="first">
-					<fmt:message key="label.view.groups.title"/>
-				</th>
-				<th>
-					<c:if test="${viewStudentsBeforeSelection}">
-						<fmt:message key="label.view.groups.learners"/>
-					</c:if>
-				</th>
-				<th>
-				</th>
+				<th width="25%" class="first"><fmt:message key="label.view.groups.title" /></th>
+				<th><c:if test="${viewStudentsBeforeSelection}">
+						<fmt:message key="label.view.groups.learners" />
+					</c:if></th>
+				<th></th>
 			</tr>
-			<logic:iterate id="group" name="groups"> 
-			<tr>
-				<td width="25%" class="first">
-					<c:out value="${group.groupName}"/>
-				</td>
-				<td width="60%">
-					<c:if test="${viewStudentsBeforeSelection}">
-						<c:forEach items="${group.users}" var="user">
-							<c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/><BR>
-						</c:forEach>
+			<logic:iterate id="group" name="groups">
+				<tr>
+					<td width="25%" class="first"><strong><c:out value="${group.groupName}" /></strong></td>
+					<td width="60%"><c:if test="${viewStudentsBeforeSelection}">
+							<c:forEach items="${group.users}" var="user">
+								<i class="fa fa-sm fa-user"></i>&nbsp;<c:out value="${user.firstName}" />&nbsp;<c:out value="${user.lastName}" />
+								<BR>
+							</c:forEach>
 						&nbsp;
-					</c:if>
-				</td>
-				<td>
-				<c:choose>
-					<c:when test="${not empty maxLearnersPerGroup and fn:length(group.users)>=maxLearnersPerGroup}">
-						<fmt:message key="label.learner.choice.group.full"/>
-					</c:when>
-					<c:otherwise>
-						<html:form action="/grouping.do?method=learnerChooseGroup&userId=${user.userID}&activityID=${activityID}&groupId=${group.groupId}" target="_self">
-							<html:submit styleClass="button"><fmt:message key="label.choose.group.button"/></html:submit>
-						</html:form>
-					</c:otherwise>
-				</c:choose>
-				</td>
-			</tr>
+					</c:if></td>
+					<td><c:choose>
+							<c:when test="${not empty maxLearnersPerGroup and fn:length(group.users)>=maxLearnersPerGroup}">
+								<fmt:message key="label.learner.choice.group.full" />
+							</c:when>
+							<c:otherwise>
+								<html:form
+									action="/grouping.do?method=learnerChooseGroup&userId=${user.userID}&activityID=${activityID}&groupId=${group.groupId}"
+									target="_self">
+									<html:submit styleClass="btn btn-sm btn-default">
+										<fmt:message key="label.choose.group.button" />
+									</html:submit>
+								</html:form>
+							</c:otherwise>
+						</c:choose></td>
+				</tr>
 			</logic:iterate>
 		</table>
-
-	</div>  <!--closes content-->
-
-	<div id="footer">
-	</div><!--closes footer-->
-
-</div>
\ No newline at end of file
+	</div>
+</lams:Page>