Index: lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -r9dffcfc34a162e2764264327642af2c6fae5ee01
--- lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e535a51e19cbc72d07bda00b019c947847d869b0)
+++ lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -17,7 +17,7 @@
 label.authoring.basic.instructions  =Instructions:
 label.authoring.basic.video  =Video:
 advanced.lockOnFinished  =Lock when finished
-advanced.allowSeeingOtherUsersRecordings  =Allow leaners to see each other  recordings
+advanced.allowSeeingOtherUsersRecordings  =Allow learners to see each other  recordings
 advanced.allowComments  =Allow comments
 advanced.allowRatings  =Allow ratings
 instructions.onlineInstructions  =Online Instructions:
@@ -118,4 +118,6 @@
 label.reflections  =Notebook Entries
 message.no.reflection.available =No notebook entry was added.
 label.monitoring.summary.no.session  =No Session Available
+label.video.options=Video Options
+label.activity.completion=End of Activity
 #======= End labels: Exported 113 labels for en AU =====
Index: lams_tool_kaltura/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -0,0 +1,53 @@
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * AdvancedAccordian.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates the show/hide entry for the Advanced Settings in Montoring.
+	 * Wiki: 
+	 */
+%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
+          	${title}
+        	</a>
+      		</span>
+        </div>
+
+        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
+		<jsp:doBody />
+		</div>
+	</div>
+</div>
+		
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/Arrow.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/Arrow.tag	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -0,0 +1,55 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%-- state = up: up arrow;  state = down: down arrow --%>
+<%@ 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}">
+		<c:set var="fullTitle">title="${title}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullTitle" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty onclick}">
+		<c:set var="fullOnclick">onclick="${onclick}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullOnclick" value=""/>
+	</c:otherwise>
+</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" ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
+	</c:when>
+	<c:otherwise>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
+	</c:otherwise>
+</c:choose>
Index: lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -r9dffcfc34a162e2764264327642af2c6fae5ee01
--- lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision e535a51e19cbc72d07bda00b019c947847d869b0)
+++ lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -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_kaltura/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/Comments.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/Comments.tag	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -0,0 +1,47 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
+<%@ attribute name="width" required="false" rtexprvalue="true"%>
+<%@ attribute name="mode" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeAndDislike" required="false" rtexprvalue="true"%>
+<%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
+<%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
+<%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+
+
+<c:if test="${empty width}">
+	<c:set var="width" value="100%" />
+</c:if>
+
+<c:if test="${empty height}">
+	<c:set var="height" value="auto" />
+</c:if>
+
+<c:set var="modeStr" value=""/>
+<c:if test="${!empty mode}">
+	<c:set var="modeStr">&mode=${mode}</c:set>
+</c:if>
+
+<c:if test="${empty likeAndDislike}">
+	<c:set var="likeAndDislike" value="false" />
+</c:if>
+
+<c:if test="${empty readOnly}">
+	<c:set var="readOnly" value="false" />
+</c:if>
+
+<c:if test="${empty sortBy}">
+	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
+</c:if>
+
+<div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+<script>
+$(document).ready(function(){
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$('#commentFrame').load(url);
+});
+</script>
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -0,0 +1,51 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<%@ 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"%>
+
+<c:if test="${empty allowCommentsVariableName}">
+	<c:set var="allowCommentsVariableName" value="allowComments" />
+</c:if>
+<c:if test="${empty allowCommentLabelKey}">
+	<c:set var="allowCommentLabelKey" value="advanced.allow.comments" />
+</c:if>
+<c:if test="${empty likeDislikeVariableName}">
+	<c:set var="likeDislikeVariableName" value="commentsLikeAndDislike" />
+</c:if>
+<c:if test="${empty likeOnlyCommentLabelKey}">
+	<c:set var="likeOnlyCommentLabelKey" value="advanced.comments.like.only" />
+</c:if>
+<c:if test="${empty likeDislikeLabelKey}">
+	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
+</c:if>
+
+<div class="checkbox">
+	<label>
+	<html:checkbox property="${allowCommentsVariableName}" value="1"
+		styleId="${allowCommentsVariableName}">
+	</html:checkbox>
+	<fmt:message key="${allowCommentLabelKey}"/>
+	</label>
+</div>
+<div class="loffset20" id="likedislike">
+		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+</div>
+
+<script>
+jQuery( document ).ready(function( $ ) {
+	if (! $("#${allowCommentsVariableName}").is(':checked')) {
+		$("#likedislike").hide();
+	}
+	$("#${allowCommentsVariableName}").click(function() {
+		$("#likedislike").toggle('slow');
+	});
+});
+</script>
+
+
Index: lams_tool_kaltura/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rb6718851271ad991d43a5a3158f8e10c9ccceaaa -r9dffcfc34a162e2764264327642af2c6fae5ee01
--- lams_tool_kaltura/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b6718851271ad991d43a5a3158f8e10c9ccceaaa)
+++ lams_tool_kaltura/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -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_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -r9dffcfc34a162e2764264327642af2c6fae5ee01
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e535a51e19cbc72d07bda00b019c947847d869b0)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -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_kaltura/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -0,0 +1,54 @@
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * AdvancedAccordian.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
+	 * Wiki: 
+	 */
+%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
+          	${title}
+        	</a>
+      		</span>
+        </div>
+
+
+		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
+		<jsp:doBody />
+		</div>
+	</div>
+</div>
+		
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/SimplePanel.tag	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -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_kaltura/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/TabBodyArea.tag	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -0,0 +1,39 @@
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBodyArea.tag
+ *	Author: Fiona Malikoff
+ *	Description: Creates the panel body area for a nav bar screen
+ * Wiki: 
+ */
+
+%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<div class="panel-body panel-monitor-body">
+	 <jsp:doBody />
+</div>
+
+</div> <!--  close tab opened in TabHeader -->
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/TabBodys.tag	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -0,0 +1,37 @@
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBodys.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a tabbody list from nested TabBody tags.
+ * Wiki: 
+ */
+
+		%>
+<%@ tag body-content="scriptless"%>
+
+<!-- tab body holder table -->
+<div class="tab-content">
+	<jsp:doBody />
+</div>
Index: lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -r9dffcfc34a162e2764264327642af2c6fae5ee01
--- lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision e535a51e19cbc72d07bda00b019c947847d869b0)
+++ lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -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_kaltura/web/pages/authoring/advanced.jsp
===================================================================
diff -u -re535a51e19cbc72d07bda00b019c947847d869b0 -r9dffcfc34a162e2764264327642af2c6fae5ee01
--- lams_tool_kaltura/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision e535a51e19cbc72d07bda00b019c947847d869b0)
+++ lams_tool_kaltura/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
@@ -28,61 +28,68 @@
 
 <!-- ========== Advanced Tab ========== -->
 
-<div class="checkbox">
-	<label for="lock-on-finished">
-		<html:checkbox property="lockOnFinished" styleId="lock-on-finished"/>
-		<fmt:message key="advanced.lockOnFinished" />
-	</label>
-</div>
+<lams:SimplePanel titleKey="label.video.options">
 
-<div class="checkbox">
-	<label for="allowContributeVideos">
-		<html:checkbox property="allowContributeVideos" styleId="allowContributeVideos"/>
-		<fmt:message key="advanced.allowContributeVideos" />
-	</label>
-</div>
+	<div class="checkbox">
+		<label for="allowContributeVideos">
+			<html:checkbox property="allowContributeVideos" styleId="allowContributeVideos"/>
+			<fmt:message key="advanced.allowContributeVideos" />
+		</label>
+	</div>
+	
+	<div class="checkbox loffset20">
+		<label for="allowSeeingOtherUsersRecordings">
+			<html:checkbox property="allowSeeingOtherUsersRecordings" styleId="allowSeeingOtherUsersRecordings"/>
+			<fmt:message key="advanced.allowSeeingOtherUsersRecordings" />
+		</label>
+	</div>
+	
+	<div class="form-inline form-group loffset20">
+		<label for="learner-contribution-limit">
+			<fmt:message key="advanced.learnerContributionLimit" />&nbsp;
+			<html:select property="learnerContributionLimit" styleId="learner-contribution-limit" styleClass="form-control input-sm">
+			<html:option value="-1"><fmt:message key="advanced.unlimited" /></html:option>
+			<html:option value="1">1</html:option>
+			<html:option value="2">2</html:option>
+			<html:option value="3">3</html:option>
+			<html:option value="4">4</html:option>
+			<html:option value="5">5</html:option>
+			<html:option value="6">6</html:option>
+			<html:option value="7">7</html:option>
+			<html:option value="8">8</html:option>
+			<html:option value="9">9</html:option>
+			<html:option value="10">10</html:option>
+		</html:select>
+		
+		</label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="allow-comments">
+			<html:checkbox property="allowComments" styleId="allow-comments"/>
+			<fmt:message key="advanced.allowComments" />
+		</label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="allow-ratings">
+			<html:checkbox property="allowRatings" styleId="allow-ratings"/>
+			<fmt:message key="advanced.allowRatings" />
+		</label>
+	</div>
 
-<div class="checkbox loffset20">
-	<label for="allowSeeingOtherUsersRecordings">
-		<html:checkbox property="allowSeeingOtherUsersRecordings" styleId="allowSeeingOtherUsersRecordings"/>
-		<fmt:message key="advanced.allowSeeingOtherUsersRecordings" />
-	</label>
-</div>
+</lams:SimplePanel>
 
-<div class="form-inline form-group loffset20">
-	<html:select property="learnerContributionLimit" styleId="learner-contribution-limit" styleClass="form-control input-sm">
-		<html:option value="-1"><fmt:message key="advanced.unlimited" /></html:option>
-		<html:option value="1">1</html:option>
-		<html:option value="2">2</html:option>
-		<html:option value="3">3</html:option>
-		<html:option value="4">4</html:option>
-		<html:option value="5">5</html:option>
-		<html:option value="6">6</html:option>
-		<html:option value="7">7</html:option>
-		<html:option value="8">8</html:option>
-		<html:option value="9">9</html:option>
-		<html:option value="10">10</html:option>
-	</html:select>
-	<label for="learner-contribution-limit">
-		&nbsp;<fmt:message key="advanced.learnerContributionLimit" />
-	</label>
-</div>
+<lams:SimplePanel titleKey="label.activity.completion">
 
 <div class="checkbox">
-	<label for="allow-comments">
-		<html:checkbox property="allowComments" styleId="allow-comments"/>
-		<fmt:message key="advanced.allowComments" />
+	<label for="lock-on-finished">
+		<html:checkbox property="lockOnFinished" styleId="lock-on-finished"/>
+		<fmt:message key="advanced.lockOnFinished" />
 	</label>
 </div>
 
 <div class="checkbox">
-	<label for="allow-ratings">
-		<html:checkbox property="allowRatings" styleId="allow-ratings"/>
-		<fmt:message key="advanced.allowRatings" />
-	</label>
-</div>
-
-<div class="checkbox">
 	<label for="reflect-on-activity">
 		<html:checkbox property="reflectOnActivity" styleId="reflect-on-activity" />
 		<fmt:message key="advanced.reflectOnActivity" />
@@ -92,3 +99,5 @@
 <div class="form-group">
 	<html:textarea property="reflectInstructions" styleId="reflect-instructions" styleClass="form-control" rows="3"	/>
 </div>
+
+</lams:SimplePanel>
\ No newline at end of file