Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
diff -u -r434a2aec5c62876edcb6dc8908896939080f1cf2 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 434a2aec5c62876edcb6dc8908896939080f1cf2)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -308,8 +308,11 @@
      */
     private ActionForward newImageInit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
+	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	
 	ImageGalleryItemForm itemForm = (ImageGalleryItemForm) form;
-	itemForm.setSessionMapID(WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID));
+	itemForm.setSessionMapID(sessionMapID);
 	return mapping.findForward(ImageGalleryConstants.SUCCESS);
     }
 
@@ -366,8 +369,11 @@
      */
     private ActionForward initMultipleImages(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
+	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
+	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	
 	MultipleImagesForm multipleForm = (MultipleImagesForm) form;
-	multipleForm.setSessionMapID(WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID));
+	multipleForm.setSessionMapID(sessionMapID);
 	return mapping.findForward(ImageGalleryConstants.SUCCESS);
     }
 
Index: lams_tool_images/web/WEB-INF/tags/Alert.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/Alert.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/Alert.tag	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -0,0 +1,46 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="close" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
+<c:set var="idName" value="alert-${type}" />
+<c:if test="${not empty id}">
+	<c:set var="idName" value="${id}" />
+</c:if>
+
+<c:set var="alertType" value="info" />
+<c:set var="iconType" value="info-circle" />
+<c:choose>
+	<c:when test="${type == 'danger'}">
+		<c:set var="alertType" value="danger" />
+		<c:set var="iconType" value="times-circle" />
+	</c:when>
+	<c:when test="${type == 'success'}">
+		<c:set var="alertType" value="success" />
+		<c:set var="iconType" value="check-circle" />
+	</c:when>
+	<c:when test="${type == 'warning'}">
+		<c:set var="alertType" value="warning" />
+		<c:set var="iconType" value="exclamation-circle" />
+	</c:when>
+</c:choose>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-${alertType}" style="margin-bottom: 10px; padding: 8px">
+			<div class="media">
+				<div class="media-left">
+					<i class="fa fa-lg fa-${iconType} text-muted"></i>
+				</div>
+				<div class="media-body">
+					<c:if test="${close}">
+							<a href="#" class="close pull-right" data-dismiss="alert" aria-label="close">&times;</a>
+					</c:if>
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -ra41ef185bfa95828df54b39993cbcfbad31f1d55 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision a41ef185bfa95828df54b39993cbcfbad31f1d55)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -69,7 +69,7 @@
 	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
 </c:if>
 <c:if test="${empty allowCommentsLabel}">
-	<c:set var="noMaximumLabel" value="label.allow.comments" scope="request"/>
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
 </c:if>
 <c:if test="${empty minNumberWordsLabel}">
 	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
Index: lams_tool_images/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -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
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -0,0 +1,36 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+<%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="style" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+
+
+
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<div class="container" id="content">
+			<div class="panel panel-default panel-${type}-page">
+				<div class="panel-heading">
+					<c:if test="${not empty title}">
+						<div class="panel-title panel-${type}-title">
+							<c:out value="${title}" escapeXml="true" />
+							<c:if test="${not empty titleHelpURL}">
+								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+							</c:if>
+						</div>
+					</c:if>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+				<div class="panel-body panel-${type}-body">
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+		<!-- End content container -->
+	</div>
+</div>
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rad572fe631188a44a1b0976295ee33af9919ed78 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision ad572fe631188a44a1b0976295ee33af9919ed78)
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -64,7 +64,7 @@
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
-<div class="rating-stars-holder">
+<div class="rating-stars-holder text-center center-block">
 
 	<c:set var="hasStartedRating" value="false"/>
 	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}">
@@ -85,9 +85,9 @@
 			</c:otherwise>
 		</c:choose>
 			
-		<h4>
+		<strong>
 			${criteriaDto.ratingCriteria.title}
-		</h4>
+		</strong>
 			
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser || not isCriteriaNotRatedByUser}'>
@@ -167,21 +167,25 @@
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
 				<div id="add-comment-area-${itemRatingDto.itemId}">
 			
-					<!-- Rating limits info -->
+					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
 					
-						<div class="info rating-info">
+						<lams:Alert type="info" id="comment-limit-${itemRatingDto.itemId}" close="false">
 							<fmt:message key="${minNumberWordsLabel}">
 								: <fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/>
 							</fmt:message>
-						</div>
+						</lams:Alert>
 					</c:if>		
 				
-					<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" onfocus="if(this.value==this.defaultValue)this.value='';" 
-							onblur="if(this.value=='')this.value=this.defaultValue;" ><fmt:message key="label.comment.textarea.tip"/></textarea>
-				
-					<div class="button add-comment add-comment-new" data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}">
-					</div>			
+					<div class="no-gutter">
+						<div class="col-xs-12 col-sm-11 ">
+						<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" onfocus="if(this.value==this.defaultValue)this.value='';" 
+								onblur="if(this.value=='')this.value=this.defaultValue;" 
+								class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>
+						</div>
+						<div class="button add-comment add-comment-new col-xs-12 col-sm-1 " data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}">
+						</div>
+					</div>		
 				</div>			
 			</c:when>
 		</c:choose>
Index: lams_tool_images/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/TSTable.tag	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -0,0 +1,53 @@
+<%-- Tablesorter Table and Pager --%>
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="numColumns" required="true" rtexprvalue="true"%>
+<%@ attribute name="dataId" required="false" rtexprvalue="true"%>
+<%@ attribute name="tableClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="pagerClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="test" required="false" rtexprvalue="true"%>
+
+<c:if test="${empty tableClass}">
+	<c:set var="tableClass" value="tablesorter" />
+</c:if>
+
+<c:if test="${empty pagerClass}">
+	<c:set var="pagerClass" value="ts-pager" />
+</c:if>
+
+<c:if test="${empty dataId}">
+	<c:set var="dataId" value="" />
+</c:if>
+
+<table class="${tableClass}" ${dataId}>
+	<thead>
+		<tr>
+			<jsp:doBody />
+		</tr>
+	</thead>
+	<tfoot>
+		<tr>
+	    	<th colspan="${numColumns}" class="${pagerClass} form-horizontal">
+	        <button type="button" class="btn first"><i class="fa fa-step-backward"></i></button>
+	        <button type="button" class="btn prev"><i class="fa fa-backward"></i></button>
+	        <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+	        <button type="button" class="btn next"><i class="fa fa-forward"></i></button>
+	        <button type="button" class="btn last"><i class="fa fa-step-forward"></i></button>
+	        <select class="pagesize input-mini" title="Select page size">
+	      		<c:if test="${not empty test}"><option value="2">2</option></c:if>
+	      		<option selected="selected" value="10">10</option>
+	      		<option value="20">20</option>
+	      		<option value="30">30</option>
+	      		<option value="40">40</option>
+	      		<option value="50">50</option>
+	      		<option value="100">100</option>
+	        </select>
+	      </th>
+	    </tr>
+	</tfoot>
+	<tbody>
+	</tbody>
+</table>
+
+	
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -440,6 +440,18 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_tool_images/web/common/header.jsp
===================================================================
diff -u -rdbbdbe1fcf86e07c4d5163178b4c679b4dedfed9 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/common/header.jsp	(.../header.jsp)	(revision dbbdbe1fcf86e07c4d5163178b4c679b4dedfed9)
+++ lams_tool_images/web/common/header.jsp	(.../header.jsp)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -8,8 +8,10 @@
 <lams:css />
 
  <!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <script type="text/javascript" src="<html:rewrite page='/includes/javascript/imageGallerycommon.js'/>"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 
 	
Index: lams_tool_images/web/common/messages.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/common/messages.jsp	(.../messages.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/common/messages.jsp	(.../messages.jsp)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -1,8 +1,8 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-	<p class="warning">
-	        <html:messages id="error">
-	            <c:out value="${error}" escapeXml="false"/><br/>
-	        </html:messages>
-	</p>
+	 <lams:Alert id="error" type="danger" close="false">
+		<html:messages id="error">
+			<c:out value="${error}" escapeXml="false"/><br/>
+		</html:messages>
+	</lams:Alert>
 </logic:messagesPresent>
Index: lams_tool_images/web/pages/learning/definelater.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_images/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -1,20 +1,21 @@
 <!DOCTYPE html>
-
 <%@include file="/common/taglibs.jsp"%>
 
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
-	<meta http-equiv="refresh" content="60">
 </lams:head>
 
 <body class="stripes">
-	<div id="content">
-		<h1>
-			<fmt:message key="activity.title" />
-		</h1>
+	<c:set scope="request" var="title">
+		<fmt:message key="activity.title" />
+	</c:set>
+	<lams:Page type="learner" title="${title}">
+	
 		<lams:DefineLater />
-	</div>
-	<div id="footer"></div>
+		
+		<div id="footer"></div>
+	
+	</lams:Page>
 </body>
 </lams:html>
Index: lams_tool_images/web/pages/learning/finish.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/pages/learning/finish.jsp	(.../finish.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_images/web/pages/learning/finish.jsp	(.../finish.jsp)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -1,15 +1,11 @@
 <!DOCTYPE html>
-		
-
 <%@ include file="/common/taglibs.jsp"%>
+
 <%-- This page just for : redir finish page to parent rather that part of the frame --%>
 <html>
 	<body class="stripes">
 		<script type="text/javascript">
-		<!--
 			document.location.href = "${nextActivityUrl}";
-		-->        
 	    </script>
-	
 	</body>
 </html>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+
 <lams:html>
 <lams:head>
 	<title>
@@ -20,7 +20,7 @@
 	<c:set var="mediumImageDimensions" value="${sessionMap.mediumImageDimensions}" />
 	<c:set var="thumbnailImageDimensions" value="${empty sessionMap.thumbnailImageDimensions ? 100 : sessionMap.thumbnailImageDimensions}" />
 
-	<link rel="stylesheet" type="text/css" href="<lams:LAMSURL/>css/thickbox.css">
+	<link rel="stylesheet" type="text/css" href="${lams}css/thickbox.css">
 	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/fotorama.css'/>"/>
 	<style media="screen,projection" type="text/css">
 		@media (max-width: 750px) {
@@ -30,11 +30,6 @@
 		    	position: static;
 		  	}
 		}
-		#check-for-new-button {
-			margin-top: 20px;
-		}
-		#check-for-new-button, #add-new-image-button, #delete-button {
-		}
 		.extra-controls-inner {
 			float: right;
 		}
@@ -53,17 +48,11 @@
 			padding-top: 20px;
 		}
 		[id^=comments-area] {
-			width: 400px;
-			float: right;
 			clear: both;
-			padding: 10px 0 20px;
+			padding-top: 10px;
 		}
-		[id^=comment-textarea] {
-			width: 370px;
-		}
 		.button.add-comment {
-			margin-right: 2px;
-			margin-top: 10px;
+			margin-right: 12px;
 		}
 		table.forum {
 			border-bottom: none;
@@ -88,19 +77,12 @@
 		   height: 0; 
 		   clear: both;
 		}
-		#kkk{
-			float:right;
-		}
-		.space-bottom-top {
-			padding-top: 40px;
-		}
     </style>
-    <link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme-blue.css">
-	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
+    <link rel="stylesheet" type="text/css" href="${lams}css/jquery.jRating.css">
+	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css">
+	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.pager.css">
     
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
- 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+ 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
  	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/fotorama.js'/>"></script>
 	<script type="text/javascript">
 	
@@ -186,19 +168,16 @@
    
 </lams:head>
 <body class="stripes">
-	<div id="content">
+	 <lams:Page type="learner" title="${imageGallery.title}">
 
-		<%--ImageGallery information-----------------------------------%>
+		<%--Advanced settings and notices-----------------------------------%>
 
-		<h1>
-			<c:out value="${imageGallery.title}" escapeXml="true"/>
-		</h1>
-		<p>
+		<div class="panel">
 			<c:out value="${imageGallery.instructions}" escapeXml="false"/>
-		</p>
+		</div>
 		
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
-			<div class="info">
+			<lams:Alert type="danger" id="lock-on-finish" close="false">
 				<c:choose>
 					<c:when test="${sessionMap.userFinished}">
 						<fmt:message key="message.activityLocked" />
@@ -207,13 +186,12 @@
 						<fmt:message key="message.warnLockOnFinish" />
 					</c:otherwise>
 				</c:choose>
-			</div>
+			</lams:Alert>
 		</c:if>
 		
-		<!-- Rating limits info -->
 		<c:if test="${imageGallery.allowRank && (imageGallery.minimumRates ne 0 || imageGallery.maximumRates ne 0)}">
 		
-			<div class="info">
+			<lams:Alert type="info" id="rating-limits" close="false">
 				<c:choose>
 					<c:when test="${imageGallery.minimumRates ne 0 and imageGallery.maximumRates ne 0}">
 						<fmt:message key="label.rate.limits.reminder">
@@ -239,7 +217,7 @@
 				<fmt:message key="label.rate.limits.topic.reminder">
 					<fmt:param value="<span id='count-rated-items'>${sessionMap.countRatedItems}</span>"/>
 				</fmt:message>
-			</div>
+			</lams:Alert>
 			
 		</c:if>
 		
@@ -260,50 +238,57 @@
 		<%--Reflection--------------------------------------------------%>
 
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
-			<div class="small-space-top">
-				<h2><fmt:message key="title.reflection" /></h2>
-				<strong>
-					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
-				</strong>
+			<div class="panel panel-default voffset10">
+				<div class="panel-heading panel-title">
+					<fmt:message key="title.reflection" />
+				</div>
+						
+		 		<div class="panel-body">
+		 			<div class="reflectionInstructions">
+						<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
+					</div>
+				
+					<div class="panel">
+						<c:choose>
+							<c:when test="${empty sessionMap.reflectEntry}">
+								<p>
+									<em> 
+										<fmt:message key="message.no.reflection.available" />
+									</em>
+								</p>
+							</c:when>
+							<c:otherwise>
+								<p>
+									<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+								</p>
+							</c:otherwise>
+						</c:choose>
+					</div>
 
-				<c:choose>
-					<c:when test="${empty sessionMap.reflectEntry}">
-						<p>
-							<em> 
-								<fmt:message key="message.no.reflection.available" />
-							</em>
-						</p>
-					</c:when>
-					<c:otherwise>
-						<p>
-							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
-						</p>
-					</c:otherwise>
-				</c:choose>
-
-				<c:if test="${mode != 'teacher'}">
-					<html:button property="FinishButton" onclick="return continueReflect()" styleClass="button">
-						<fmt:message key="label.edit" />
-					</html:button>
-				</c:if>
+					<c:if test="${mode != 'teacher'}">
+						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default pull-left">
+							<fmt:message key="label.edit" />
+						</html:button>
+					</c:if>
+				</div>
 			</div>
 		</c:if>
 		
 		<%--Bottom buttons-------------------------------------------%>
 
 		<c:if test="${mode != 'teacher'}">
-			<div class="space-bottom-top align-right" id="learner-submit"
+			<div id="learner-submit" class="voffset10"
 				<c:if test="${imageGallery.minimumRates ne 0 && empty sessionMap.currentImage}">style="display:none;"</c:if>
 			>
 				<c:choose>
 					<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="button" >
+						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-primary pull-right" >
 							<fmt:message key="label.continue" />
 						</html:button>
 					</c:when>
 					<c:otherwise>
-						<html:link href="#nogo" property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button" >
-							<span class="nextActivity">
+						<html:link href="#nogo" property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="btn btn-primary pull-right" >
+							<span class="na">
 								<c:choose>
 				 					<c:when test="${sessionMap.activityPosition.last}">
 				 						<fmt:message key="label.submit" />
@@ -319,11 +304,10 @@
 			</div>
 		</c:if>	
 
-	</div>
-	<%--closes content--%>
+	</lams:Page>
+	<%--closes lams:Page--%>
 
-	<div id="footer">
-	</div>
+	<div id="footer"></div>
 	<%--closes footer--%>
 
 </body>
Index: lams_tool_images/web/pages/learning/notebook.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMapID" value="${param.sessionMapID}" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
 <lams:html>
 <lams:head>
-	<title><fmt:message key="label.learning.title" />
-	</title>
+	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 	
 	<script type="text/javascript">
@@ -18,47 +19,45 @@
 	</script>
 </lams:head>
 <body class="stripes">
+	<lams:Page type="learner" title="${sessionMap.title}">
+		
+		<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
+			<html:hidden property="userID" />
+			<html:hidden property="sessionMapID" />
 
-	<c:set var="sessionMapID" value="${param.sessionMapID}" />
-	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-	
-	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
-		<html:hidden property="userID" />
-		<html:hidden property="sessionMapID" />
-
-		<div id="content">
-			<h1>
-				<c:out value="${sessionMap.title}" escapeXml="true"/>
-			</h1>
-
 			<%@ include file="/common/messages.jsp"%>
 
 			<p>
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 			</p>
 
-			<html:textarea cols="60" rows="8" property="entryText"	styleClass="text-area" />
+			<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control" />
 
-			<div class="space-bottom-top align-right">
-				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity">
-						<c:choose>
-		 					<c:when test="${sessionMap.activityPosition.last}">
-		 						<fmt:message key="label.submit" />
-		 					</c:when>
-		 					<c:otherwise>
-		 		 				<fmt:message key="label.finished" />
-		 					</c:otherwise>
-		 				</c:choose>
-		 			</span>
-				</html:link>
-			</div>
+			<html:link href="#nogo" styleClass="btn btn-primary voffset5 pull-right" styleId="finishButton" onclick="submitForm('finish')">
+				<div class="na"> 
+					<c:choose>
+						<c:when test="${sessionMap.activityPosition.last}">
+							<fmt:message key="label.submit" />
+						</c:when>
+						<c:otherwise>
+			 				<fmt:message key="label.finished" />
+						</c:otherwise>
+					</c:choose>
+				</div>
+			</html:link>
+				
+		</html:form>
+	
+		<div id="footer">
 		</div>
-	</html:form>
+		<!--closes footer-->
+	
+	</lams:Page>
 
-	<div id="footer">
-	</div>
-	<!--closes footer-->
-
+	<script type="text/javascript">
+		window.onload = function() {
+			document.getElementById("focused").focus();
+		}
+	</script>
 </body>
 </lams:html>
Index: lams_tool_images/web/pages/learning/parts/addimage.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/pages/learning/parts/addimage.jsp	(.../addimage.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_images/web/pages/learning/parts/addimage.jsp	(.../addimage.jsp)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-		
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
@@ -8,31 +7,33 @@
 			<fmt:message key="label.learning.title" />
 		</title>
 		<%@ include file="/common/header.jsp"%>
+		
+		<script type="text/javascript">
+			$(document).ready(function(){ 
+				document.getElementById("image-title").focus();
+			});
+		</script>
 	</lams:head>
 	
 	<body class="stripes">
-		<div id="content" >
+		<c:set var="title"><fmt:message key="label.authoring.basic.add.image" /></c:set>
+		<lams:Page type="learner" title="${title}">
+		
 			<%@ include file="/common/messages.jsp"%>
 			
 			<html:form action="/learning/saveNewImage" method="post" styleId="imageGalleryItemForm" enctype="multipart/form-data">
 				<html:hidden property="sessionMapID" />
 	
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.basic.add.image" />
-				</h2>
-	
 				<div class="field-name">
 					<fmt:message key="label.authoring.basic.resource.title.input" />
 				</div>
-				<html:text property="title" size="55" tabindex="1" />
+				<html:text property="title" tabindex="1" styleClass="form-control" styleId="image-title"/>
 		
 				<div class="field-name space-top">
 	            	<fmt:message key="label.authoring.basic.resource.description.input" />
 				</div>
-				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="sessionMap"	value="${sessionScope[formBean.sessionMapID]}" />
 				<div class="small-space-bottom" >
-					<lams:STRUTS-textarea rows="5" cols="20" tabindex="4" styleClass="text-area" property="description" />
+					<lams:STRUTS-textarea rows="5" tabindex="4" styleClass="text-area form-control" property="description" />
 				</div>
 	
 				<div class="field-name space-top">
@@ -43,7 +44,7 @@
 				</div>
 				
 				<div style="margin-bottom: 0px; margin-top: 15px;">
-					<a href="<html:rewrite page='/learning/initMultipleImages.do?sessionMapID='/>${formBean.sessionMapID}&KeepThis=true&TB_iframe=true&height=500&width=480&modal=true" class="thickbox">  
+					<a href="<html:rewrite page='/learning/initMultipleImages.do?sessionMapID='/>${sessionMapID}&KeepThis=true&TB_iframe=true&height=500&width=480&modal=true" class="thickbox">  
 						<fmt:message key="label.authoring.basic.upload.multiple.images" />
 					</a>				
 				</div>
@@ -52,19 +53,18 @@
 			<br><br>
 	
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="document.imageGalleryItemForm.submit();" class="button-add-item">
+				<a href="#" onclick="document.imageGalleryItemForm.submit();" class="button-add-item btn btn-primary ">
 					<fmt:message key="label.authoring.basic.add.image" /> 
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" class="button space-left" name="goback">
+				<a href="#" onclick="self.parent.tb_remove();" class="btn btn-primary  space-left" >
 					<fmt:message key="label.cancel" /> 
 				</a>
 			</lams:ImgButtonWrapper>
 		
-		</div>
+		</lams:Page>
 		<!--closes content-->
 	
-		<div id="footer">
-		</div>
+		<div id="footer"></div>
 		<!--closes footer-->		
 	</body>
 </lams:html>
Index: lams_tool_images/web/pages/learning/parts/addmultipleimages.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/pages/learning/parts/addmultipleimages.jsp	(.../addmultipleimages.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_images/web/pages/learning/parts/addmultipleimages.jsp	(.../addmultipleimages.jsp)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-		
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
@@ -12,17 +11,14 @@
 	
 	<body class="stripes">
 	
-		<div id="content" >
+		<c:set var="title"><fmt:message key="label.authoring.basic.add.multiple.images" /></c:set>
+		<lams:Page type="learner" title="${title}">
 		
 			<%@ include file="/common/messages.jsp"%>
 			
 			<html:form action="/learning/saveMultipleImages" method="post" styleId="multipleImagesForm" enctype="multipart/form-data">
 				<html:hidden property="sessionMapID" />
 	
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.basic.add.multiple.images" />
-				</h2>
-	
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.resource.files.input" />
 				</div>
@@ -41,10 +37,9 @@
 				<div style="margin-top: 4px; margin-left: 15px;">
 					<input type="file" name="file5" />
 				</div>
-				
-				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />			
+							
 				<div style="margin-bottom: 0px; margin-top: 15px;">
-					<a href="<html:rewrite page='/learning/newImageInit.do?sessionMapID='/>${formBean.sessionMapID}&KeepThis=true&TB_iframe=true&height=540&width=480&modal=true" class="thickbox">  
+					<a href="<html:rewrite page='/learning/newImageInit.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=540&width=480&modal=true" class="thickbox">  
 						<fmt:message key="label.authoring.basic.upload.single.image" />
 					</a>				
 				</div>
@@ -54,19 +49,18 @@
 			<br><br>
 	
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="document.multipleImagesForm.submit();" class="button-add-item">
+				<a href="#" onclick="document.multipleImagesForm.submit();" class="button-add-item btn btn-primary">
 					<fmt:message key="label.authoring.basic.add.images" /> 
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+				<a href="#" onclick="self.parent.tb_remove();" class="button btn btn-primary">
 					<fmt:message key="label.cancel" /> 
 				</a>
 			</lams:ImgButtonWrapper>
 		
-		</div>
+		</lams:Page>
 		<!--closes content-->
 	
-		<div id="footer">
-		</div>
+		<div id="footer"></div>
 		<!--closes footer-->		
 	</body>
 </lams:html>
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r4d9c834a6dd2067f34b9ee2acaed81ff7b61d2f2 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 4d9c834a6dd2067f34b9ee2acaed81ff7b61d2f2)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -98,20 +98,20 @@
 				
 			<c:if test="${imageGallery.allowShareImages}">
 			
-				<a href="#nogo" onclick="return checkNew()" class="button" id="check-for-new-button"> 
+				<a href="#nogo" onclick="return checkNew()" class="btn btn-default" id="check-for-new-button"> 
 					<fmt:message key="label.check.for.new" /> 
 				</a>
 							
 				<c:if test="${not finishedLock}">
-					<br><br>
-					<a href="<html:rewrite page='/learning/newImageInit.do?sessionMapID='/>${sessionMapID}&KeepThis=true&TB_iframe=true&height=540&width=480&modal=true" class="button thickbox" id="add-new-image-button">  
+					<br>
+					<a href="<html:rewrite page='/learning/newImageInit.do?sessionMapID='/>${sessionMapID}&KeepThis=true&TB_iframe=true&height=540&width=480&modal=true" class="btn btn-default voffset10 thickbox" id="add-new-image-button">  
 						<fmt:message key="label.learning.add.new.image" />
 					</a>
 				</c:if>
 				
 				<c:if test="${sessionMap.isAuthor}">
-					<br><br>
-					<a href="#nogo" onclick="return deleteImage(${sessionMap.currentImage.uid});" class="button" id="delete-button"> 
+					<br>
+					<a href="#nogo" onclick="return deleteImage(${sessionMap.currentImage.uid});" class="btn btn-default voffset10" id="delete-button"> 
 						<fmt:message key="label.learning.delete.image" /> 
 					</a>
 				</c:if>
Index: lams_tool_images/web/pages/learning/start.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r0ac411e19ec849c9586c506feede55d178f84d56
--- lams_tool_images/web/pages/learning/start.jsp	(.../start.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_images/web/pages/learning/start.jsp	(.../start.jsp)	(revision 0ac411e19ec849c9586c506feede55d178f84d56)
@@ -1,11 +1,8 @@
 <!DOCTYPE html>
-		
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <html>
 	<body class="stripes">
-
 		<script type="text/javascript">
 			window.parent.location.href = "<c:url value="/learning/start.do?toolSessionID=${toolSessionID}&mode=${mode}"/>"
 		</script>
Fisheye: Tag 0ac411e19ec849c9586c506feede55d178f84d56 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learning/success.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?