Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
===================================================================
diff -u -r94e36ba92006160e48c47ff2a60bb4f525c011e1 -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java	(.../LearningController.java)	(revision 94e36ba92006160e48c47ff2a60bb4f525c011e1)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java	(.../LearningController.java)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
@@ -433,7 +433,7 @@
 	// get session value
 	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
 	if (!validateBeforeFinish(request, sessionMapID)) {
-	    return "pages/learning/notebook";
+	    return "pages/learning/learning";
 	}
 
 	HttpSession ss = SessionManager.getSession();
@@ -453,7 +453,7 @@
 	    reflectionForm.setEntryText(entry.getEntry());
 	}
 
-	return "pages/learning/finish";
+	return "/pages/learning/notebook";
     }
 
     /**
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
@@ -32,7 +32,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -123,11 +122,11 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+		</a>
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
+		</a>
 </div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_larsrc/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e
--- lams_tool_larsrc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
@@ -1,5 +1,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
Index: lams_tool_larsrc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e
--- lams_tool_larsrc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e
--- lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e
--- lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_tool_larsrc/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e
--- lams_tool_larsrc/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
@@ -30,7 +30,6 @@
 
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5f1ca1dd020bb422c0a23bc69bdb18ec372696e refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
@@ -135,42 +135,6 @@
 
 	<jsp-config>
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>