Index: lams_learning/web/notebook/addnew.jsp
===================================================================
diff -u -r37456eedc8b0580b57b6fcb255323c5c49943119 -rad2a44cf5737f17483ecb2a732b0d6adcaad8078
--- lams_learning/web/notebook/addnew.jsp	(.../addnew.jsp)	(revision 37456eedc8b0580b57b6fcb255323c5c49943119)
+++ lams_learning/web/notebook/addnew.jsp	(.../addnew.jsp)	(revision ad2a44cf5737f17483ecb2a732b0d6adcaad8078)
@@ -22,21 +22,15 @@
 <!DOCTYPE html>
 <%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants"%>
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="scratchPadSig">
-	<%=CoreNotebookConstants.SCRATCH_PAD_SIG%>
-</c:set>
-<c:set var="scratchJournalSig">
-	<%=CoreNotebookConstants.JOURNAL_SIG%>
-</c:set>
+<c:set var="scratchPadSig"><%=CoreNotebookConstants.SCRATCH_PAD_SIG%></c:set>
+<c:set var="scratchJournalSig"><%=CoreNotebookConstants.JOURNAL_SIG%></c:set>
+<c:set var="lams"><lams:LAMSURL /></c:set>
 	
 <lams:html>
 <lams:head>
 	<title><fmt:message key="mynotes.title" /></title>
 
 	<lams:css />
-	<c:set var="lams">
-		<lams:LAMSURL />
-	</c:set>
 
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
@@ -69,16 +63,22 @@
 				<label for="title"><fmt:message key="mynotes.entry.title.label"></fmt:message></label>
 				<form:input path="title" id="title" cssClass="form-control"/>
 			</div> 
+			
 			<div class="form-group">
 				<label for="entry"><fmt:message key="mynotes.entry.entry.label"></fmt:message></label>
 				<form:textarea path="entry" id="entry" cssClass="form-control" rows="8" />
-			</div> 
+			</div>
+			
 			<div class="voffset10 pull-right">
-				<a href="#" class="btn btn-default" id="saveInNotebookBtn"
-					onClick="doSubmit('${scratchPadSig}')"><fmt:message
-						key="mynotes.notebook.save.button" /></a> <a href="#" class="btn btn-default" id="saveInJournalBtn"
-					onClick="doSubmit('${scratchJournalSig}')"><fmt:message key="mynotes.journal.save.button" /></a>
-				<a href="javascript: history.back();" class="btn btn-default" id="cancelBtn"><fmt:message key="label.cancel.button" /></a>
+				<a href="#" class="btn btn-default" id="saveInNotebookBtn" onClick="doSubmit('${scratchPadSig}')">
+					<fmt:message key="mynotes.notebook.save.button" />
+				</a> 
+				<a href="#" class="btn btn-default" id="saveInJournalBtn" onClick="doSubmit('${scratchJournalSig}')">
+					<fmt:message key="mynotes.journal.save.button" />
+				</a>
+				<a href="javascript: history.back();" class="btn btn-default" id="cancelBtn">
+					<fmt:message key="label.cancel.button" />
+				</a>
 			</div>
 		</form:form>
 	</lams:Page>
