Index: lams_tool_pixlr/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r6eaaff81c675b592c0efa20bf13dacc7863f460b
--- lams_tool_pixlr/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_pixlr/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
@@ -114,6 +114,7 @@
 output.desc.image.url.definition.pixlr  =Image URL from Pixlr
 button.submit  =Finish
 message.no.reflection.available =No notebook entry was added.
+label.image.options=Image Options
+label.activity.completion=End of Activity
 
-
 #======= End labels: Exported 108 labels for en AU =====
Index: lams_tool_pixlr/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -r9764f125869d4c781a498d256cb80cd51d044500 -r6eaaff81c675b592c0efa20bf13dacc7863f460b
--- lams_tool_pixlr/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 9764f125869d4c781a498d256cb80cd51d044500)
+++ lams_tool_pixlr/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
@@ -6,6 +6,8 @@
 <%@ attribute name="state" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="onclick" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="display" required="false"  rtexprvalue="true"%>
 
 <c:choose>
 	<c:when test="${not empty title}">
@@ -26,10 +28,28 @@
 </c:choose>
 
 <c:choose>
+	<c:when test="${not empty id}">
+		<c:set var="fullId">id="${id}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullId" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty display}">
+	<c:set var="fullDisplay">style='display:${display}'</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullDisplay" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
 	<c:when test="${fn:containsIgnoreCase(state, 'up')}">
-		<i class="fa fa-long-arrow-up fa-pull-left" ${fullTitle} ${fullOnclick}></i>
+		<i class="fa fa-long-arrow-up fa-pull-left" ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
 	</c:when>
 	<c:otherwise>
-		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullTitle} ${fullOnclick}></i>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
 	</c:otherwise>
 </c:choose>
Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4 -r6eaaff81c675b592c0efa20bf13dacc7863f460b
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
@@ -24,8 +24,8 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
-<c:if test="${fn:containsIgnoreCase(method,'replace')}">
-	<c:set var="toolbarSet">${toolbarSet}Replace</c:set>
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
 </c:if>
 
 <c:if test="${empty displayExpanded}">
Index: lams_tool_pixlr/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r9764f125869d4c781a498d256cb80cd51d044500 -r6eaaff81c675b592c0efa20bf13dacc7863f460b
--- lams_tool_pixlr/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 9764f125869d4c781a498d256cb80cd51d044500)
+++ lams_tool_pixlr/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_pixlr/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rb6718851271ad991d43a5a3158f8e10c9ccceaaa -r6eaaff81c675b592c0efa20bf13dacc7863f460b
--- lams_tool_pixlr/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b6718851271ad991d43a5a3158f8e10c9ccceaaa)
+++ lams_tool_pixlr/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
@@ -34,6 +34,7 @@
 <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="timeago" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
@@ -42,6 +43,10 @@
 	<c:set var="type" value="both" scope="request"/>
 </c:if>
 
+<c:if test="${not empty timeago}">
+	<time class="timeago" datetime="<fmt:formatDate value='${value}' timeZone="GMT" pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>">
+</c:if>
+	
 <c:choose>
 	<c:when test="${style=='short'}">
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
@@ -53,3 +58,7 @@
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="medium" />
 	</c:otherwise>
 </c:choose>
+
+<c:if test="${not empty timeago}">
+	</time>
+</c:if>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4 -r6eaaff81c675b592c0efa20bf13dacc7863f460b
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
@@ -24,7 +24,7 @@
 						<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>
+								<span class="pull-right">${titleHelpURL}</span>
 							</c:if>
 						</div>
 						<c:if test="${not empty headingContent}">
Index: lams_tool_pixlr/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/SimplePanel.tag	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
@@ -0,0 +1,32 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+
+<c:if test="${not empty titleKey}">
+	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
+</c:if>
+
+<div class="panel panel-default">
+	<c:if test="${not empty title or not empty titleHelpURL}">
+	<div class="panel-heading">
+		<div class="panel-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>
+	</div>
+	</c:if>
+	<div class="panel-body ${panelBodyClass}">
+		<jsp:doBody />
+	</div>
+</div>
+
+
+		
+			
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4 -r6eaaff81c675b592c0efa20bf13dacc7863f460b
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
@@ -426,15 +426,15 @@
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
-   	</tag-file>
+   	</tag-file>   
    	<tag-file>
        <name>AuthoringRatingCriteria</name>
        <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
    	</tag-file>
    	<tag-file>
        <name>Rating</name>
        <path>/WEB-INF/tags/Rating.tag</path>
-   	</tag-file>   	
+   	</tag-file>    		
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
@@ -467,10 +467,14 @@
        <name>AdvancedAccordian</name>
        <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>  
-   	<tag-file>   		
+   	<tag-file>
    		<name>RestrictedUsageAccordian</name>
    		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
+   	</tag-file>
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
Index: lams_tool_pixlr/web/pages/authoring/advanced.jsp
===================================================================
diff -u -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4 -r6eaaff81c675b592c0efa20bf13dacc7863f460b
--- lams_tool_pixlr/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
+++ lams_tool_pixlr/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
@@ -2,32 +2,36 @@
 
 <!-- ========== Advanced Tab ========== -->
 
-<div class="checkbox">
-	<label for="lock-when-finished">
-		<html:checkbox property="lockOnFinished" styleId="lock-when-finished"/>
-		<fmt:message key="advanced.lockOnFinished" />
-	</label>
-</div>
+<lams:SimplePanel titleKey="label.image.options">
+	<div class="checkbox">
+		<label for="allowViewOthersImages">
+			<html:checkbox property="allowViewOthersImages" value="1" styleId="allowViewOthersImages"/>
+			<fmt:message key="advanced.allowViewOthersImages" />
+		</label>
+	</div>
+</lams:SimplePanel>
 
-<div class="checkbox">
-	<label for="allowViewOthersImages">
-		<html:checkbox property="allowViewOthersImages" value="1" styleId="allowViewOthersImages"/>
-		<fmt:message key="advanced.allowViewOthersImages" />
-	</label>
-</div>
-
-<!-- Reflection -->
-<div class="checkbox">
-	<label for="reflect-on-activity">
-		<html:checkbox property="reflectOnActivity" styleId="reflect-on-activity"/>
-		<fmt:message key="advanced.reflectOnActivity" />
-	</label>
-</div>
-
-<div class="form-group">
-	<html:textarea property="reflectInstructions" cols="60" rows="3" styleId="reflect-instructions" styleClass="form-control"/>
-</div>
-
+<lams:SimplePanel titleKey="label.activity.completion">
+	<div class="checkbox">
+		<label for="lock-when-finished">
+			<html:checkbox property="lockOnFinished" styleId="lock-when-finished"/>
+			<fmt:message key="advanced.lockOnFinished" />
+		</label>
+	</div>
+	
+	<!-- Reflection -->
+	<div class="checkbox">
+		<label for="reflect-on-activity">
+			<html:checkbox property="reflectOnActivity" styleId="reflect-on-activity"/>
+			<fmt:message key="advanced.reflectOnActivity" />
+		</label>
+	</div>
+	
+	<div class="form-group">
+		<html:textarea property="reflectInstructions" cols="60" rows="3" styleId="reflect-instructions" styleClass="form-control"/>
+	</div>
+</lams:SimplePanel>
+	
 <script type="text/javascript">
 	//automatically turn on refect option if there are text input in refect instruction area
 	var ra = document.getElementById("reflect-instructions");