Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -196,12 +196,13 @@
 			</html:form>
 			
 			<div class="voffset10 pull-right">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
+				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.essay.add.essay" />
 				</a>
-				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
-					<fmt:message key="label.cancel" />
-				</a>
+				
 			</div>
 
 		</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -217,12 +217,13 @@
 			</div>
 
 			<div class="voffset10 pull-right">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
+				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.choice.add.multiple.choice" />
 				</a>
-				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
-					<fmt:message key="label.cancel" />
-				</a>
+				
 			</div>
 
 		</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -190,12 +190,13 @@
 			</form>
 
 			<div class="voffset10 pull-right clear-both">
+			<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
+				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.matching.pairs.add.matching.pairs" />
 				</a>
-				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
-					<fmt:message key="label.cancel" />
-				</a>
+				
 			</div>
 
 		</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -259,12 +259,13 @@
 			</div>
 
 			<div class="voffset10 pull-right">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
+				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.choice.add.multiple.choice" />
 				</a>
-				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
-					<fmt:message key="label.cancel" />
-				</a>
+				
 			</div>			
 
 		</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -263,12 +263,13 @@
 			</form>
 
 			<div class="voffset10 pull-right clear-both">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
+				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.numerical.add.numerical" />
 				</a>
-				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
-					<fmt:message key="label.cancel" />
-				</a>
+				
 			</div>			
 
 		</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -207,12 +207,13 @@
 			</div>
 
 			<div class="voffset10 pull-right">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
+				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.ordering.add.ordering" />
 				</a>
-				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
-					<fmt:message key="label.cancel" />
-				</a>
+				
 			</div>			
 
 		</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -198,12 +198,13 @@
 			</form>
 
 			<div class="voffset10 pull-right clear-both">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
+				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.short.answer.add.short.answer" />
 				</a>
-				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
-					<fmt:message key="label.cancel" />
-				</a>
+				
 			</div>			
 
 		</div>
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -173,12 +173,13 @@
 			</html:form>
 
 			<div class="voffset10 pull-right">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
+				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.true.false.add.true.false" />
 				</a>
-				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
-					<fmt:message key="label.cancel" />
-				</a>
+				
 			</div>			
 
 		</div>
Index: lams_tool_chat/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r8955c559e118a75bcdec763ebae2e745a0421236 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_chat/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
+++ lams_tool_chat/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -31,9 +31,6 @@
 		<%@ include file="/common/messages.jsp"%>
 		<html:form action="/authoring/saveOrUpdateCondition" method="post" styleId="chatConditionForm" focus="displayName" >
 			<html:hidden property="orderId" />
-			<h2 class="no-space-left">
-				<fmt:message key="label.authoring.conditions.add.condition" />
-			</h2>
 
 			<div class="form-group">
             	<label for="displayName"><fmt:message key="label.authoring.conditions.condition.name" /></label>
@@ -43,11 +40,12 @@
 			<lams:TextSearch wrapInFormTag="false" sessionMapID="${sessionMapID}"  />
 		</html:form>
 
-		<div class="voffset5">
+		<div class="voffset5 pull-right">
+		<a href="javascript:;" onclick="hideConditionMessage()" class="btn btn-default btn-xs">
+				<fmt:message key="label.cancel" /> </a>
 			<a href="javascript:;" onclick="submitCondition();" class="btn btn-default btn-xs">
 				<fmt:message key="label.save" /></a>
-			<a href="javascript:;" onclick="hideConditionMessage()" class="btn btn-default btn-xs">
-				<fmt:message key="label.cancel" /> </a>
+			
 		</div>
 
 	</div>
Index: lams_tool_daco/web/pages/authoring/parts/buttons.jsp
===================================================================
diff -u -r756d63ed6f0fe8da2cbd61b5420f49def38d7590 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_daco/web/pages/authoring/parts/buttons.jsp	(.../buttons.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
+++ lams_tool_daco/web/pages/authoring/parts/buttons.jsp	(.../buttons.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -1,4 +1,6 @@
 <div class="voffset5">
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="btn btn-default btn-xs"> <fmt:message key="${addButtonMessageKey}" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="btn btn-default btn-xs loffset5"> <fmt:message key="label.common.cancel" /> </a>
+    <div><br /></div>
+    <div><br /></div>
+	<a href="#" onclick="javascript:submitDacoQuestion()" class="btn btn-default btn-xs pull-right"> <fmt:message key="${addButtonMessageKey}" /> </a>
+	<a href="#" onclick="javascript:cancelDacoQuestion()" class="btn btn-default btn-xs loffset5 pull-right"> <fmt:message key="label.common.cancel" /> </a>
 </div>
Index: lams_tool_forum/web/jsps/authoring/addCondition.jsp
===================================================================
diff -u -r26a0240d04a160036cc15d1adca267cd1e9c42e5 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_forum/web/jsps/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 26a0240d04a160036cc15d1adca267cd1e9c42e5)
+++ lams_tool_forum/web/jsps/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -45,9 +45,10 @@
 			
 		</html:form>
 
-		<div class="voffset5">
+		<div class="voffset5 pull-right">
+		    <a href="#" onclick="hideConditionMessage();" class="btn btn-default btn-xs"><fmt:message key="button.cancel" /> </a>
 			<a href="#" onclick="submitCondition();" class="btn btn-default btn-xs"><fmt:message key="label.save" /> </a>
-			<a href="#" onclick="hideConditionMessage();" class="btn btn-default btn-xs"><fmt:message key="button.cancel" /> </a>
+			
 		</div>
 		
 	</div>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r26a0240d04a160036cc15d1adca267cd1e9c42e5 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 26a0240d04a160036cc15d1adca267cd1e9c42e5)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -41,7 +41,7 @@
 				<html:errors property="message.attachment" />
 			</div>
 
-			<div class="voffset5">
+			<div class="voffset5 pull-right">
 				<a href="#" onclick="hideMessage()" class="btn btn-default btn-xs"> <fmt:message key="button.cancel" /></a>
 				<a href="#" onclick="submitMessage()" class="btn btn-default btn-xs loffset5"> <fmt:message key="button.add" /> </a>
 			</div>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -r26a0240d04a160036cc15d1adca267cd1e9c42e5 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 26a0240d04a160036cc15d1adca267cd1e9c42e5)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -47,7 +47,7 @@
 				</div>
 			</div>
 
-			<div class="voffset5">
+			<div class="voffset5 pull-right">
 				<a href="#" onclick="hideMessage()" class="btn btn-default btn-xs"> <fmt:message key="button.cancel" /></a>
 				<a href="#" onclick="submitMessage()" class="btn btn-default btn-xs loffset5"> <fmt:message key="button.add" /> </a>
 			</div>
Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -r60ab803bf843562083cfb66764ddfcb3b0a83841 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 60ab803bf843562083cfb66764ddfcb3b0a83841)
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -54,12 +54,13 @@
 		</html:form>
 	
 		<div class="voffset10 pull-right">
+		    <a href="#nogo" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-default loffset5">
+				<fmt:message key="label.cancel" /> 
+			</a>
 			<a href="#nogo" onclick="javascript:submitImageGalleryItem()" class="btn btn-sm btn-default button-add-item">
 				<fmt:message key="label.authoring.basic.add.image" /> 
 			</a>
-			<a href="#nogo" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-default loffset5">
-				<fmt:message key="label.cancel" /> 
-			</a>
+			
 		</div>
 		
 	</div>
Index: lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp
===================================================================
diff -u -r60ab803bf843562083cfb66764ddfcb3b0a83841 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	(.../addmultipleimages.jsp)	(revision 60ab803bf843562083cfb66764ddfcb3b0a83841)
+++ lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	(.../addmultipleimages.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -44,12 +44,12 @@
 		</html:form>
 			
 		<div class="voffset10 pull-right">
+		    <a href="#nogo" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-default loffset5">
+				<fmt:message key="label.cancel" /> 
+			</a>
 			<a href="#nogo" onclick="javascript:submitMultipleImageGalleryItems()" class="btn btn-sm btn-default button-add-item">
 				<fmt:message key="label.authoring.basic.add.images" /> 
 			</a>
-			<a href="#nogo" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-default loffset5">
-				<fmt:message key="label.cancel" /> 
-			</a>
 		</div>
 		
 	</div>
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r2f9a65bc4981d91b9bc37f5470177dddd687c1b7 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 2f9a65bc4981d91b9bc37f5470177dddd687c1b7)
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -197,13 +197,15 @@
 				<html:textarea property="feedback" rows="3" cols="70" styleClass="form-control"></html:textarea>
 			</div>
 			
-			<a href="#" onclick="addItem();" onmousedown="self.focus();" class="btn btn-default btn-sm"> 
+			<a href="#" onclick="addItem();" onmousedown="self.focus();" class="btn btn-default btn-sm pull-right"> 
 				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.add.new.question" />
 			</a>
-
-			<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default btn-sm"> 
+			
+			<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default btn-sm pull-right"> 
 				<fmt:message key="label.cancel" />
 			</a>
+			
+		
 
 		</lams:Page>
 
Index: lams_tool_laqa/web/authoring/addCondition.jsp
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -37,9 +37,9 @@
 		
 	</html:form>
 
-	<div class="voffset5">
+	<div class="voffset5 pull-right">
+	    <a href="#" onclick="hideConditionMessage();" class="btn btn-default btn-xs"><fmt:message key="label.cancel" /> </a>
 		<a href="#" onclick="submitCondition()" class="btn btn-default btn-xs"><fmt:message key="label.save.question" /> </a>
-		<a href="#" onclick="hideConditionMessage();" class="btn btn-default btn-xs"><fmt:message key="label.cancel" /> </a>
 	</div>
 </div>
 </div>
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r320934945c495ab0832be6fb547d83812ac3152a -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -48,9 +48,9 @@
 	    			   value="${qaGeneralAuthoringDTO.editableQuestionFeedback}" />
 	</div>
 	
-	<div class="voffset5">
-		<a href="#" onclick="submitMessage()" class="btn btn-default btn-xs"> <fmt:message key="label.save.question" /></a>
+	<div class="voffset5 pull-right">
 		<a href="#" onclick="hideMessage()" class="btn btn-default btn-xs loffset5"> <fmt:message key="label.cancel" /> </a>
+		<a href="#" onclick="submitMessage()" class="btn btn-default btn-xs"> <fmt:message key="label.save.question" /></a>
 	</div>
 </html:form>
 </div>
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -rb3fe40cd67fc779a6eee8320fadc3a489565a557 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision b3fe40cd67fc779a6eee8320fadc3a489565a557)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -51,12 +51,14 @@
 	
 			<!-- Instructions -->
 			<%@ include file="instructions.jsp"%>
-			
-			<div class="voffset5">
+			<div><br/></div>
+			<div><br/></div>
+			<div class="voffset5 pull-right">
+			    <a href="javascript:;" onclick="hideResourceItem()" class="btn btn-default btn-sm">
+					<fmt:message key="label.cancel" /> </a>
 				<a href="#" onclick="submitResourceItem()" class="btn btn-default btn-sm">
 					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.add.file" /> </a>
-				<a href="javascript:;" onclick="hideResourceItem()" class="btn btn-default btn-sm">
-					<fmt:message key="label.cancel" /> </a>
+			    
 			</div>
 						
 			</div>
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -rb3fe40cd67fc779a6eee8320fadc3a489565a557 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision b3fe40cd67fc779a6eee8320fadc3a489565a557)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -51,12 +51,13 @@
 
 			<!-- Instructions -->
 			<%@ include file="instructions.jsp"%>
-		
-			<div class="voffset5">
+		    <div><br/></div>
+			<div><br/></div>
+			<div class="voffset5 pull-right">
+			    <a href="javascript:;" onclick="hideResourceItem()"	class="btn btn-default btn-sm">
+					<fmt:message key="label.cancel" /> </a>
 				<a href="#" onclick="submitResourceItem()" class="btn btn-default btn-sm">
 					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.add.learning.object" /> </a>
-				<a href="javascript:;" onclick="hideResourceItem()"	class="btn btn-default btn-sm">
-					<fmt:message key="label.cancel" /> </a>
 			</div>
 			
 			</div>
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -rb3fe40cd67fc779a6eee8320fadc3a489565a557 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision b3fe40cd67fc779a6eee8320fadc3a489565a557)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -47,12 +47,14 @@
 
 			<!-- Instructions -->
 			<%@ include file="instructions.jsp"%>
-
-			<div class="voffset5">
+            <div><br/></div>
+			<div><br/></div>
+			<div class="voffset5 pull-right">
+			    <a href="javascript:;" onclick="hideResourceItem()" class="btn btn-default btn-sm">
+					<fmt:message key="label.cancel" /> </a>
 				<a href="#" onclick="submitResourceItem()" class="btn btn-default btn-sm">
 					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.add.url" /> </a>
-				<a href="javascript:;" onclick="hideResourceItem()" class="btn btn-default btn-sm">
-					<fmt:message key="label.cancel" /> </a>
+				
 			</div>
 			
 			</div>
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -rb3fe40cd67fc779a6eee8320fadc3a489565a557 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision b3fe40cd67fc779a6eee8320fadc3a489565a557)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -52,12 +52,13 @@
 		
 			<!-- Instructions -->
 			<%@ include file="instructions.jsp"%>
-			
-			<div class="voffset5">
+			<div><br/></div>
+			<div><br/></div>
+			<div class="voffset5 pull-right">
+			    <a href="javascript:;" onclick="hideResourceItem()" class="btn btn-default btn-sm">
+					<fmt:message key="label.cancel" /> </a>
 				<a href="#" onclick="submitResourceItem()" class="btn btn-default btn-sm">
 					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.add.website" /> </a>
-				<a href="javascript:;" onclick="hideResourceItem()" class="btn btn-default btn-sm">
-					<fmt:message key="label.cancel" /> </a>
 			</div>
 		<br />
 
Index: lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -rb3fe40cd67fc779a6eee8320fadc3a489565a557 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision b3fe40cd67fc779a6eee8320fadc3a489565a557)
+++ lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -38,7 +38,7 @@
 			</c:forEach>
 		</table>
 
-		<a href="#nogo" onclick="javascript:addInstruction();" class="btn btn-default btn-sm">
+		<a href="#nogo" onclick="javascript:addInstruction();" class="btn btn-default btn-sm pull-right">
 			<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.resource.add.instruction" /> 
 		</a>
 
Index: lams_tool_notebook/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -ra0a249e0861e944d080689e4ebb853566cd40f2d -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_notebook/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
+++ lams_tool_notebook/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -26,12 +26,13 @@
 			<lams:TextSearch wrapInFormTag="false" sessionMapID="${sessionMapID}" />
 		</html:form>
 
-		<div class="voffset5">
-			<a href="#" onclick="submitCondition()"
-				class="btn btn-default btn-xs"><fmt:message key="label.save" />
-			</a> <a href="#" onclick="hideConditionMessage()"
+		<div class="voffset5 pull-right">
+		    <a href="#" onclick="hideConditionMessage()"
 				class="btn btn-default btn-xs"><fmt:message key="button.cancel" />
 			</a>
+			<a href="#" onclick="submitCondition()"
+				class="btn btn-default btn-xs"><fmt:message key="label.save" />
+			</a> 
 		</div>
 	</div>
 </div>
\ No newline at end of file
Index: lams_tool_scribe/web/pages/authoring/headingForm.jsp
===================================================================
diff -u -r252c0090e443f8dff1b983b64f7323b3fc2063ff -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_scribe/web/pages/authoring/headingForm.jsp	(.../headingForm.jsp)	(revision 252c0090e443f8dff1b983b64f7323b3fc2063ff)
+++ lams_tool_scribe/web/pages/authoring/headingForm.jsp	(.../headingForm.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -47,12 +47,13 @@
 		
 			<lams:CKEditor id="heading" value="${headingText}" contentFolderID="${sessionMap.contentFolderID}"/>
 		
-			<div class="voffset5">
+			<div class="voffset5 pull-right">
+			    <a href="#" onclick="javascript:hideMessage()" class="btn btn-default btn-sm">
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.cancel" /> </a>
 				<a href="#" onclick="submitHeading()" class="btn btn-default btn-sm">
 					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.submit" /> </a>
 
-				<a href="#" onclick="javascript:hideMessage()" class="btn btn-default btn-sm">
-					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.cancel" /> </a>
+				
 			</div>
 		</div>
 	</div>
Index: lams_tool_survey/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r230631757ce5657c02733128542f738928cc514e -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_survey/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 230631757ce5657c02733128542f738928cc514e)
+++ lams_tool_survey/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -34,9 +34,9 @@
 	
 	</html:form>
 
-	<div class="voffset5">
-		<a href="#" onclick="submitCondition();" class="btn btn-default btn-xs"><fmt:message key="label.save" /> </a>
-		<a href="#" onclick="hideConditionMessage();" class="btn btn-default btn-xs"><fmt:message key="button.cancel" /> </a>
+	<div class="voffset5 pull-right">
+	    <a href="#" onclick="hideConditionMessage();" class="btn btn-default btn-xs"><fmt:message key="button.cancel" /> </a>
+	    <a href="#" onclick="submitCondition();" class="btn btn-default btn-xs"><fmt:message key="label.save" /> </a>
 	</div>
 
 </div>
Index: lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp
===================================================================
diff -u -r230631757ce5657c02733128542f738928cc514e -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	(.../addchoicequestion.jsp)	(revision 230631757ce5657c02733128542f738928cc514e)
+++ lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	(.../addchoicequestion.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -69,12 +69,11 @@
 		<!-- Instructions -->
 
 		<%@ include file="instructions.jsp"%>
-
-		<a href="#" onclick="submitSurveyItem()" class="btn btn-default btn-sm">
+		
+		<a href="#" onclick="submitSurveyItem()" class="btn btn-default btn-sm pull-right">
 			<i class="fa fa-plus"></i>&nbsp; <fmt:message key="label.authoring.basic.add.question" /> </a>
-
 		<a href="javascript:;" onclick="cancelSurveyItem()"
-			class="btn btn-default btn-sm"> <fmt:message key="label.cancel" /> </a>
-
+			class="btn btn-default btn-sm pull-right"> <fmt:message key="label.cancel" /> </a>
+		
 		</div>
 	</div>
Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp
===================================================================
diff -u -r230631757ce5657c02733128542f738928cc514e -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision 230631757ce5657c02733128542f738928cc514e)
+++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -37,11 +37,12 @@
 			</div>
 
 		</html:form>
-
-		<a href="#" onclick="submitSurveyItem()" class="btn btn-default btn-sm">
+        <a href="#" onclick="submitSurveyItem()" class="btn btn-default btn-sm pull-right">
 			<fmt:message key="label.authoring.basic.add.question" /> </a>
-		<a href="javascript:;" onclick="cancelSurveyItem()"
-			class="btn btn-default btn-sm"> <fmt:message key="label.cancel" /> </a>
+        <a href="javascript:;" onclick="cancelSurveyItem()"
+			class="btn btn-default btn-sm pull-right"> <fmt:message key="label.cancel" /> </a>
 		
+		
+		
 		</div>
 	</div>
\ No newline at end of file
Index: lams_tool_task/web/pages/authoring/parts/addcondition.jsp
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -44,12 +44,13 @@
 				</logic:iterate>
 				</div>
 				
-			<div class="voffset5">
-				<a href="#" onclick="submitCondition()"
-					class="btn btn-default btn-xs"><fmt:message key="button.add" />
-				</a> <a href="#" onclick="hideConditionMessage()"
+			<div class="voffset5 pull-right">
+			    <a href="#" onclick="hideConditionMessage()"
 					class="btn btn-default btn-xs"><fmt:message key="label.cancel" />
 				</a>
+				<a href="#" onclick="submitCondition()"
+					class="btn btn-default btn-xs"><fmt:message key="button.add" />
+				</a> 
 			</div>
 			
 			</html:form>
Index: lams_tool_task/web/pages/authoring/parts/addtask.jsp
===================================================================
diff -u -rd6dcae53cbe27a85aedf62b8545ee3193ec55220 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
+++ lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -129,8 +129,8 @@
 	
 			</html:form>
 	
-			<a href="#" onclick="javascript:submitTask();" class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.add" /> </a>
-			<a href="#" onclick="javascript:hideMessage()" class="btn btn-default btn-sm"><fmt:message key="label.cancel" /> </a>
+			<a href="#" onclick="javascript:submitTask();" class="btn btn-default btn-sm pull-right"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.add" /> </a>
+			<a href="#" onclick="javascript:hideMessage()" class="btn btn-default btn-sm pull-right"><fmt:message key="label.cancel" /> </a>
 			
 			</div>
 		</div>
Index: lams_tool_vote/web/authoring/editNominationBox.jsp
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_vote/web/authoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/authoring/editNominationBox.jsp	(.../editNominationBox.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -31,11 +31,11 @@
 				</lams:CKEditor>
 			</div>
 			
-			<div class="voffset5">
+			<div class="voffset5 pull-right">
+			    <a href="#" onclick="javascript:hideMessage()"
+				class="btn btn-default btn-sm"> <fmt:message key="label.cancel" /></a>
 				<a href="#" onclick="javascript:submitNomination()" class="btn btn-default btn-sm">
 					<i class="fa fa-plus"></i>&nbsp; <fmt:message key="label.save.nomination" /> </a>
-				<a href="#" onclick="javascript:hideMessage()"
-				class="btn btn-default btn-sm"> <fmt:message key="label.cancel" /></a>
 			</div>
 					
 		</html:form>
Index: lams_tool_vote/web/authoring/newNominationBox.jsp
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_vote/web/authoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/authoring/newNominationBox.jsp	(.../newNominationBox.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -31,11 +31,12 @@
 				</lams:CKEditor>
 			</div>
 			
-			<div class="voffset5">
+			<div class="voffset5 pull-right">
+			    <a href="#" onclick="javascript:hideMessage()"
+				class="btn btn-default btn-sm"> <fmt:message key="label.cancel" /></a>
 				<a href="#" onclick="javascript:submitNomination()" class="btn btn-default btn-sm">
 					<i class="fa fa-plus"></i>&nbsp; <fmt:message key="label.save.nomination" /> </a>
-				<a href="#" onclick="javascript:hideMessage()"
-				class="btn btn-default btn-sm"> <fmt:message key="label.cancel" /></a>
+				
 			</div>
 			
 		</html:form>
Index: lams_tool_wiki/web/pages/authoring/basic.jsp
===================================================================
diff -u -r3de077ba003f37f0aa2653224cc89a116a159d72 -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271
--- lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 3de077ba003f37f0aa2653224cc89a116a159d72)
+++ lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
@@ -180,8 +180,8 @@
 			</label>
 		</div>
 		<div class="pull-right">
+		    <a href="javascript:changeDiv('view');" class="btn btn-default"><fmt:message key="button.cancel"></fmt:message></a>
 			<a href="javascript:doEditOrAdd('editPage');" class="btn btn-primary"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
-			<a href="javascript:changeDiv('view');" class="btn btn-default"><fmt:message key="button.cancel"></fmt:message></a>
 		</div>
 	</div>
 </div>
@@ -212,8 +212,8 @@
 			</label>
 		</div>
 		<div class="pull-right">
+		    <a href="javascript:cancelAdd();changeDiv('view');" class="btn btn-default"><fmt:message key="button.cancel"></fmt:message></a>
 			<a href="javascript:doEditOrAdd('addPage');" class="btn btn-primary"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
-			<a href="javascript:cancelAdd();changeDiv('view');" class="btn btn-default"><fmt:message key="button.cancel"></fmt:message></a>
 		</div>
   </div>
 </div>