Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java
===================================================================
diff -u -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 -r3bc514681593b0694c54d0c77da015388362c196
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	(.../ImageGalleryConstants.java)	(revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	(.../ImageGalleryConstants.java)	(revision 3bc514681593b0694c54d0c77da015388362c196)
@@ -78,6 +78,8 @@
     public static final String ATTR_COMMENT = "comment";
     public static final String ATTR_CURRENT_IMAGE_UID = "currentImageUid";
     public static final String ATTR_CONTENT_FOLDER_ID = "contentFolderID";
+    public static final String ATTR_MEDIUM_IMAGE_DIMENSIONS = "mediumImageDimensions";
+    public static final String ATTR_THUMBNAIL_IMAGE_DIMENSIONS = "thumbnailImageDimensions";
     
     // error message keys
     public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank";
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java
===================================================================
diff -u -rea01084a256b16e755ba6953267255776d63fb27 -r3bc514681593b0694c54d0c77da015388362c196
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	(.../ImageGalleryItem.java)	(revision ea01084a256b16e755ba6953267255776d63fb27)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	(.../ImageGalleryItem.java)	(revision 3bc514681593b0694c54d0c77da015388362c196)
@@ -26,11 +26,9 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 
 /**
  * ImageGallery
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
diff -u -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 -r3bc514681593b0694c54d0c77da015388362c196
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 3bc514681593b0694c54d0c77da015388362c196)
@@ -51,6 +51,7 @@
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery;
+import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryConfigItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
@@ -175,6 +176,26 @@
 	    }
 	}
 
+	// basic information
+	sessionMap.put(ImageGalleryConstants.ATTR_TITLE, imageGallery.getTitle());
+	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE_INSTRUCTION, imageGallery.getInstructions());
+	sessionMap.put(ImageGalleryConstants.ATTR_FINISH_LOCK, lock);
+	sessionMap.put(ImageGalleryConstants.ATTR_LOCK_ON_FINISH, imageGallery.getLockWhenFinished());
+	sessionMap.put(ImageGalleryConstants.ATTR_USER_FINISHED, (imageGalleryUser != null)
+		&& imageGalleryUser.isSessionFinished());
+
+	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+	sessionMap.put(AttributeNames.ATTR_MODE, mode);
+	// reflection information
+	sessionMap.put(ImageGalleryConstants.ATTR_REFLECTION_ON, imageGallery.isReflectOnActivity());
+	sessionMap.put(ImageGalleryConstants.ATTR_REFLECTION_INSTRUCTION, imageGallery.getReflectInstructions());
+	sessionMap.put(ImageGalleryConstants.ATTR_REFLECTION_ENTRY, entryText);	
+	
+	ImageGalleryConfigItem mediumImageDimensionsKey = service.getConfigItem(ImageGalleryConfigItem.KEY_MEDIUM_IMAGE_DIMENSIONS);
+	ImageGalleryConfigItem thumbnailImageDimensionsKey = service.getConfigItem(ImageGalleryConfigItem.KEY_THUMBNAIL_IMAGE_DIMENSIONS);
+	sessionMap.put(ImageGalleryConstants.ATTR_MEDIUM_IMAGE_DIMENSIONS, Integer.parseInt(mediumImageDimensionsKey.getConfigValue()));	
+	sessionMap.put(ImageGalleryConstants.ATTR_THUMBNAIL_IMAGE_DIMENSIONS, Integer.parseInt(thumbnailImageDimensionsKey.getConfigValue()));	
+	
 	// add define later support
 	if (imageGallery.isDefineLater()) {
 	    return mapping.findForward("defineLater");
@@ -210,22 +231,8 @@
 		}
 	    }
 	}
-	// basic information
-	sessionMap.put(ImageGalleryConstants.ATTR_TITLE, imageGallery.getTitle());
-	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE_INSTRUCTION, imageGallery.getInstructions());
-	sessionMap.put(ImageGalleryConstants.ATTR_FINISH_LOCK, lock);
-	sessionMap.put(ImageGalleryConstants.ATTR_LOCK_ON_FINISH, imageGallery.getLockWhenFinished());
-	sessionMap.put(ImageGalleryConstants.ATTR_USER_FINISHED, (imageGalleryUser != null)
-		&& imageGalleryUser.isSessionFinished());
-
-	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
-	sessionMap.put(AttributeNames.ATTR_MODE, mode);
-	// reflection information
-	sessionMap.put(ImageGalleryConstants.ATTR_REFLECTION_ON, imageGallery.isReflectOnActivity());
-	sessionMap.put(ImageGalleryConstants.ATTR_REFLECTION_INSTRUCTION, imageGallery.getReflectInstructions());
-	sessionMap.put(ImageGalleryConstants.ATTR_REFLECTION_ENTRY, entryText);	
+	
 	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE_ITEM_LIST, imageGalleryItemList);	
-
 	sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE, imageGallery);
 
 	return mapping.findForward(ImageGalleryConstants.SUCCESS);
@@ -353,7 +360,6 @@
 	if (image.getCreateBy() != null) {
 	    image.getCreateBy().getLoginName();
 	}
-	sessionMap.put("aa", image.getUid());
 
 	if (imageGallery.isAllowCommentImages()) {
 	    TreeSet<ImageComment> comments = new TreeSet<ImageComment>(new ImageCommentComparator());
Index: lams_tool_images/web/includes/javascript/jquery.rating.1.1.js
===================================================================
diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -r3bc514681593b0694c54d0c77da015388362c196
--- lams_tool_images/web/includes/javascript/jquery.rating.1.1.js	(.../jquery.rating.1.1.js)	(revision 5d9ada1b3b139591dc6f1fffec04990beb727522)
+++ lams_tool_images/web/includes/javascript/jquery.rating.1.1.js	(.../jquery.rating.1.1.js)	(revision 3bc514681593b0694c54d0c77da015388362c196)
@@ -99,29 +99,35 @@
       };
       
       //insert rating option right after preview element
-      preElemTemp  = $('<div class="star"><a href="javascript:;" title="' + this.title + '">' + this.value + '</a></div>');
-      $(prevElem).after(preElemTemp);
-      $(preElemTemp)
-        .mouseover(function(){
-           event.drain(n);
-           event.fill(n, this);
-           
-         })
-         .mouseout(function(){
-           event.drain(n);
-           event.reset(n);
-         })
-         .click(function(){
-           groups[n].currentValue = $(this).children('a').text();
-           $(groups[n].valueElem).val(groups[n].currentValue);
-           event.drain(n);
-           
-           // callback function, as requested here: http://plugins.jquery.com/node/1655
-           if(settings.callback) settings.callback.apply($(groups[n].valueElem)[0], [groups[n].currentValue, this]);
-           
-           //event.reset();
-           event.fill(n, this);
-         });      
+      if (settings.readOnly) {
+          preElemTemp = $('<div class="star star_readonly"><a href="javascript:;" title="' + this.title + '">' + this.value + '</a></div>');
+          $(prevElem).after(preElemTemp);
+      } else {
+          preElemTemp = $('<div class="star"><a href="javascript:;" title="' + this.title + '">' + this.value + '</a></div>');
+          $(prevElem).after(preElemTemp);
+   	  
+          $(preElemTemp)
+          .mouseover(function(){
+             event.drain(n);
+             event.fill(n, this);
+             
+           })
+           .mouseout(function(){
+             event.drain(n);
+             event.reset(n);
+           })
+           .click(function(){
+             groups[n].currentValue = $(this).children('a').text();
+             $(groups[n].valueElem).val(groups[n].currentValue);
+             event.drain(n);
+             
+             // callback function, as requested here: http://plugins.jquery.com/node/1655
+             if(settings.callback) settings.callback.apply($(groups[n].valueElem)[0], [groups[n].currentValue, this]);
+             
+             //event.reset();
+             event.fill(n, this);
+           });      
+      }
       
       //if(console) console.log(['###', n, this.checked, groups[n].initial]);
       if(this.checked) groups[n].initial = preElemTemp;
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 -r3bc514681593b0694c54d0c77da015388362c196
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3bc514681593b0694c54d0c77da015388362c196)
@@ -18,6 +18,8 @@
 	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
 	<c:set var="imageGallery" value="${sessionMap.imageGallery}" />
 	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
+	<c:set var="mediumImageDimensions" value="${sessionMap.mediumImageDimensions}" />
+	<c:set var="thumbnailImageDimensions" value="${sessionMap.thumbnailImageDimensions}" />
 
 	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/jquery.jcarousel.css'/>" />
 	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/jquery.jcarousel.skin.css'/>" />
@@ -26,16 +28,16 @@
 	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/thickbox.css'/>" />
 	<style media="screen,projection" type="text/css">
 		.galleria_container{position:relative;margin-top:2em;}
-		.gallery_demo{width:702px;margin:0 auto 0 0;}
-		.gallery_demo li{width:100px;height:100px;border:3px double #111;margin: 0 2px;background:#000;}
+		.gallery_demo{width:${mediumImageDimensions + 62}px;margin:0 auto 0 0;}
+		.gallery_demo li{width:${thumbnailImageDimensions}px;height:${thumbnailImageDimensions}px;border:3px double #111;margin: 0 2px;background:#000;}
 		.gallery_demo li div{left:240px}
 		.gallery_demo li div .caption{font:italic 0.7em/1.4 georgia,serif;}
 		
 		.caption{position:absolute;top:0px;left:0px;width:150px;font-size:12px;color:#0087e5;}
 		#description{position:absolute; top:1000px; left:1000px; width:150px; font-style:italic;}
 		#rating_stars{position: absolute; top: 1000px; left: 1000px; width:150px; margin-top: 10}		
 		
-		#main_image{margin: 0 auto 20 0; height: 500px; width: 640px;}
+		#main_image{margin: 0 auto 20 0; height: ${(mediumImageDimensions*3)/4 + 20}px; width: ${mediumImageDimensions}px;}
 		#main_image img{margin-bottom: 10px; border: 1px solid #111;}
 		
 		.check_for_new{position: relative; top: -123px; left: 660px;}
@@ -74,17 +76,16 @@
 
 				//positioning image title, description and rating
 				caption.css('left',image.width() + 20);
+				$('#description').html("");
 				$("#description").css('left', image.width() + 20);
 				$("#description").css('top', caption.height() + 10);
-				$("#rating_stars").css('left', image.width() + 20);
-				//adjust #rating_stars top position to description height 
-				var newTopPosition = (image.height() > caption.height() + $("#description").height() + 60) 
-					? image.height() - 40 
-					: caption.height() + $("#description").height() + 20;
-				$("#rating_stars").css('top', newTopPosition);
+				setStarRatingChecked(0);
+				$("#rating_stars").css('left', image.width() + 20);					
+				$("#rating_stars").css('top', image.height() - 40);
 				
 				//adjust #main_image height to real image size
-				var newHeight = (image.height() >= 480) ? 640 : 480;
+				var newHeight = (image.height() >= ${(mediumImageDimensions*3)/4}) ? ${mediumImageDimensions} : ${(mediumImageDimensions*3)/4};
+				//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!TODO for the JIRA
 			    $('#main_image').css('height', newHeight + 20);
 
 			    loadImageData(thumb.attr('id'));
@@ -130,6 +131,18 @@
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
 
+		function addNewComment(currentImageUid, comment){
+			var url = "<c:url value="/learning/addNewComment.do"/>";
+			$(commentsAreaTargetDiv).load(
+				url,
+				{
+					currentImageUid: currentImageUid, 
+					comment: comment,
+					sessionMapID: "${sessionMapID}"
+				}
+			);
+		}
+
 		//The panel of imageGallery list panel
 		var commentsAreaTargetDiv = "#commentsArea";
 		function loadImageData(imageUid){
@@ -149,26 +162,17 @@
 			$('#description').html(description);
 
 			var imageUid = $('#commentsArea_imageUid').val();
-			if (${imageGallery.allowRank && (mode != 'teacher')}) {	
+			if (${imageGallery.allowRank && (mode != 'teacher')}) {
+				//adjust #rating_stars top position to description height 
+				if ($('#main_image img').height() < $('span.caption').height() + $("#description").height() + 60) {
+					$("#rating_stars").css('top', $('span.caption').height() + $("#description").height() + 20);	
+				}
+
 				var numberRatings = $('#commentsArea_numberRatings').val();
 				$('#numberRatings').html(numberRatings);
 				
 				var currentRating = $('#commentsArea_currentRating').val();
-				$('#rating_stars_inputs').empty();
-				for (var i = 1; i <= 5; i = i + 1) {
-					var checked = (currentRating == i) ? "checked = 'checked' " : "";
-					$('#rating_stars_inputs').append('<input class="star" type="radio" name="rating" value="' + i + '"' + checked + '/>');
-				}
-				$('input[@type=radio].star').rating({
-					callback: function() {
-				    	var options = { 
-				    		success: afterRatingSubmit  // post-submit callback
-				        }; 				
-				    				
-						$('#ratingForm').ajaxSubmit(options);
-						return false;
-					}
-				});
+				setStarRatingChecked(currentRating);
 
 				var title = "<fmt:message key='label.learning.average.rating'/> " + $('#commentsArea_averageRating').val();
 				$('.star a').attr('title', title);
@@ -209,25 +213,30 @@
 			}
 			
 		}
-		
+		function setStarRatingChecked(currentRating){
+			$('#rating_stars_inputs').empty();
+			for (var i = 1; i <= 5; i = i + 1) {
+				var checked = (currentRating == i) ? "checked = 'checked' " : "";
+				$('#rating_stars_inputs').append('<input class="star" type="radio" name="rating" value="' + i + '"' + checked + '/>');
+			}
+			$('input[@type=radio].star').rating({
+				readOnly: ${finishedLock},
+				callback: function() {
+			    	var options = { 
+			    		success: afterRatingSubmit  // post-submit callback
+			        }; 				
+			    				
+					$('#ratingForm').ajaxSubmit(options);
+					return false;
+				}
+			});
+		}		
 
 		// post-submit callback 
 		function afterRatingSubmit(responseText, statusText)  { 
 			var imageUid = $('#commentsArea_imageUid').val();
 			loadImageData(imageUid);
 		} 
-		
-		function addNewComment(currentImageUid, comment){
-			var url = "<c:url value="/learning/addNewComment.do"/>";
-			$(commentsAreaTargetDiv).load(
-				url,
-				{
-					currentImageUid: currentImageUid, 
-					comment: comment,
-					sessionMapID: "${sessionMapID}"
-				}
-			);
-		}
 	-->        
     </script>
    
@@ -341,7 +350,7 @@
 			
 		</div>
 		<div class="after_main_image"></div>
-
+		
 		<%--Comments area----------------------------------------------%>	
  		
 		<div id="commentsArea">
@@ -359,7 +368,8 @@
 				<c:choose>
 					<c:when test="${empty sessionMap.reflectEntry}">
 						<p>
-							<em> <fmt:message key="message.no.reflection.available" />
+							<em> 
+								<fmt:message key="message.no.reflection.available" />
 							</em>
 						</p>
 					</c:when>
@@ -371,8 +381,7 @@
 				</c:choose>
 
 				<c:if test="${mode != 'teacher'}">
-					<html:button property="FinishButton"
-						onclick="return continueReflect()" styleClass="button">
+					<html:button property="FinishButton" onclick="return continueReflect()" styleClass="button">
 						<fmt:message key="label.edit" />
 					</html:button>
 				</c:if>
@@ -384,16 +393,13 @@
 		<c:if test="${mode != 'teacher'}">
 			<div class="space-bottom-top align-right" >
 				<c:choose>
-					<c:when
-						test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-						<html:button property="FinishButton"
-							onclick="return continueReflect()" styleClass="button" >
+					<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
+						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="button" >
 							<fmt:message key="label.continue" />
 						</html:button>
 					</c:when>
 					<c:otherwise>
-						<html:button property="FinishButton" styleId="finishButton"
-							onclick="return finishSession()" styleClass="button" >
+						<html:button property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button" >
 							<fmt:message key="label.finished" />
 						</html:button>
 					</c:otherwise>
@@ -410,4 +416,3 @@
 
 </body>
 </lams:html>
-
Index: lams_tool_images/web/pages/learning/parts/commentlist.jsp
===================================================================
diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -r3bc514681593b0694c54d0c77da015388362c196
--- lams_tool_images/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision 5d9ada1b3b139591dc6f1fffec04990beb727522)
+++ lams_tool_images/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision 3bc514681593b0694c54d0c77da015388362c196)
@@ -1,4 +1,4 @@
-<c:set var="comments" value="${sessionMap.comments}" />
+<c:set var="comments" value="${commentsSessionMap.comments}" />
 <c:if test="${not empty comments}">
 	<div class="field-name">
 		<fmt:message key="label.learning.comments" />
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 -r3bc514681593b0694c54d0c77da015388362c196
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 3bc514681593b0694c54d0c77da015388362c196)
@@ -1,36 +1,37 @@
 <%@ include file="/common/taglibs.jsp"%>
 	
-<c:set var="sessionMapID" value="${param.sessionMapID}" />
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<c:set var="imageGallery" value="${sessionMap.imageGallery}" />
-<c:set var="image" value="${sessionMap.currentImage}" />
-<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
-<c:if test="${!image.createByAuthor && (image.createBy != null)}">
-	<c:set var="addedBy_" >
+<c:set var="commentsSessionMapID" value="${param.sessionMapID}" />
+<c:set var="commentsSessionMap" value="${sessionScope[commentsSessionMapID]}" />
+<c:set var="commentsMode" value="${commentsSessionMap.mode}" />
+<c:set var="commentsImageGallery" value="${commentsSessionMap.imageGallery}" />
+<c:set var="commentsImage" value="${commentsSessionMap.currentImage}" />
+<c:set var="commentsFinishedLock" value="${commentsSessionMap.finishedLock}" />
+<c:if test="${!commentsImage.createByAuthor && (commentsImage.createBy != null)}">
+	<c:set var="commentsAddedBy" >
 		<fmt:message key="label.learning.added.by" /> 
 		<br>
-		${image.createBy.loginName}
+			${commentsImage.createBy.loginName}
 		<br>
 	</c:set>
 </c:if>
 
 
-<input type="hidden" name="imageUid" id="commentsArea_imageUid" value="${image.uid}"/>
-<input type="hidden" name="imageDescription" id="commentsArea_description" value="${image.description}"/>
-<input type="hidden" name="averageRating" id="commentsArea_averageRating" value="${image.averageRating}"/>
-<input type="hidden" name="numberRatings" id="commentsArea_numberRatings" value="${image.numberRatings}"/>
-<input type="hidden" name="currentRating" id="commentsArea_currentRating" value="${sessionMap.currentRating}"/>
-<input type="hidden" name="votedImageUid" id="commentsArea_votedImageUid" value="${sessionMap.votedImageUid}"/>
-<input type="hidden" name="addedBy" id="commentsArea_addedBy" value="${addedBy_}"/>
+<input type="hidden" name="imageUid" id="commentsArea_imageUid" value="${commentsImage.uid}"/>
+<input type="hidden" name="imageDescription" id="commentsArea_description" value="${commentsImage.description}"/>
+<input type="hidden" name="averageRating" id="commentsArea_averageRating" value="${commentsImage.averageRating}"/>
+<input type="hidden" name="numberRatings" id="commentsArea_numberRatings" value="${commentsImage.numberRatings}"/>
+<input type="hidden" name="currentRating" id="commentsArea_currentRating" value="${commentsSessionMap.currentRating}"/>
+<input type="hidden" name="votedImageUid" id="commentsArea_votedImageUid" value="${commentsSessionMap.votedImageUid}"/>
+<input type="hidden" name="addedBy" id="commentsArea_addedBy" value="${commentsAddedBy}"/>
 
 
-<c:if test="${imageGallery.allowCommentImages && (not empty sessionMap.imageGalleryList)}">
+<c:if test="${commentsImageGallery.allowCommentImages && (not empty commentsSessionMap.imageGalleryList)}">
 
 	<%@ include file="/common/messages.jsp"%>
 
 	<%@ include file="commentlist.jsp"%>
 
-	<c:if test="${mode != 'teacher' && (not finishedLock)}">
+	<c:if test="${commentsMode != 'teacher' && (not commentsFinishedLock)}">
 		<div class="field-name">
 			<fmt:message key="label.learning.add.comment" />
 		</div>
@@ -39,7 +40,7 @@
 			<html:form action="learning/addNewComment" method="post">
 				<lams:STRUTS-textarea property="comment" rows="3" cols="75" styleId="comment_textarea" style="margin-right:10px;"/>		
 		
-				<html:button property="commentButton" onclick="javascript:addNewComment(${sessionMap.currentImage.uid}, document.getElementById('comment__lamshidden').value);" styleClass="button" style="vertical-align:bottom;">
+				<html:button property="commentButton" onclick="javascript:addNewComment(${commentsSessionMap.currentImage.uid}, document.getElementById('comment__lamshidden').value);" styleClass="button" style="vertical-align:bottom;">
 					<fmt:message key="label.learning.post" />
 				</html:button>
 			</html:form>					
Index: lams_tool_images/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r3bc514681593b0694c54d0c77da015388362c196
--- lams_tool_images/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 3bc514681593b0694c54d0c77da015388362c196)
@@ -11,7 +11,7 @@
 	<!--
 		function finishSession(){
 			document.getElementById("finishButton").disabled = true;
-			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&runOffline=true"/>';
+			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}"/>';
 			return false;
 		}
 		function continueReflect(){
@@ -24,6 +24,7 @@
 
 <body class="stripes">
 	<div id="content">
+
 		<h1>
 			${sessionMap.title}
 		</h1>
@@ -63,14 +64,12 @@
 			<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="button">
 						<fmt:message key="label.continue" />
 					</html:button>
 				</c:when>
 				<c:otherwise>
-					<html:button property="FinishButton" styleId="finishButton"
-						onclick="return finishSession()" styleClass="button">
+					<html:button property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button">
 						<fmt:message key="label.finished" />
 					</html:button>
 				</c:otherwise>