Index: lams_tool_task/web/pages/authoring/parts/addcondition.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/authoring/parts/addcondition.jsp,v
diff -u -r1.5.2.5 -r1.5.2.6
--- lams_tool_task/web/pages/authoring/parts/addcondition.jsp	3 Jun 2016 00:18:11 -0000	1.5.2.5
+++ lams_tool_task/web/pages/authoring/parts/addcondition.jsp	13 Sep 2016 09:28:25 -0000	1.5.2.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/authoring/parts/addtask.jsp,v
diff -u -r1.11.2.7 -r1.11.2.8
--- lams_tool_task/web/pages/authoring/parts/addtask.jsp	3 Jun 2016 00:18:11 -0000	1.11.2.7
+++ lams_tool_task/web/pages/authoring/parts/addtask.jsp	13 Sep 2016 09:28:31 -0000	1.11.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/editNominationBox.jsp,v
diff -u -r1.14.2.4 -r1.14.2.5
--- lams_tool_vote/web/authoring/editNominationBox.jsp	26 May 2016 13:01:09 -0000	1.14.2.4
+++ lams_tool_vote/web/authoring/editNominationBox.jsp	13 Sep 2016 09:29:00 -0000	1.14.2.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/newNominationBox.jsp,v
diff -u -r1.17.2.5 -r1.17.2.6
--- lams_tool_vote/web/authoring/newNominationBox.jsp	26 May 2016 13:01:09 -0000	1.17.2.5
+++ lams_tool_vote/web/authoring/newNominationBox.jsp	13 Sep 2016 09:29:07 -0000	1.17.2.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/authoring/basic.jsp,v
diff -u -r1.15.2.3 -r1.15.2.4
--- lams_tool_wiki/web/pages/authoring/basic.jsp	23 Jul 2016 10:24:55 -0000	1.15.2.3
+++ lams_tool_wiki/web/pages/authoring/basic.jsp	13 Sep 2016 09:30:02 -0000	1.15.2.4
@@ -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>