Index: lams_central/conf/xdoclet/taglib-tag.xml
===================================================================
diff -u -ra2a6ede815624fe9d6f5474ca844e895ddccd9ae -rbb948b046fb4d5eb811a3a24c1ce7a47d5476d7e
--- lams_central/conf/xdoclet/taglib-tag.xml	(.../taglib-tag.xml)	(revision a2a6ede815624fe9d6f5474ca844e895ddccd9ae)
+++ lams_central/conf/xdoclet/taglib-tag.xml	(.../taglib-tag.xml)	(revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e)
@@ -224,4 +224,9 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	
+   	<tag-file>
+	    <name>ImgButtonWrapper</name>
+		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>  
+   	
    	
\ No newline at end of file
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -re4a1fb3c417f6227175bef9c7e20e985feec6a85 -rbb948b046fb4d5eb811a3a24c1ce7a47d5476d7e
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e)
@@ -430,5 +430,9 @@
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>ImgButtonWrapper</name>
+		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>  
 
 </taglib>
Index: lams_central/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/ImgButtonWrapper.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/ImgButtonWrapper.tag	(revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e)
@@ -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
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_central/web/css/defaultHTML_rtl.css
===================================================================
diff -u -r5ccdf3abd160794bbb4ffc0951ca452ed02ed047 -rbb948b046fb4d5eb811a3a24c1ce7a47d5476d7e
--- lams_central/web/css/defaultHTML_rtl.css	(.../defaultHTML_rtl.css)	(revision 5ccdf3abd160794bbb4ffc0951ca452ed02ed047)
+++ lams_central/web/css/defaultHTML_rtl.css	(.../defaultHTML_rtl.css)	(revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e)
@@ -272,8 +272,7 @@
 	background: url('../images/css/body_bg.jpg') repeat-y top right;
 	padding: 0px 15px 40px 15px;
 	font-size: 11px;
-	margin-top: -5px
-	
+	margin-top: -5px;
 }
 
 /*layout of Links within the content area */
@@ -381,17 +380,26 @@
 	padding:3px 25px 5px 15px;
 	font-size:11px;
 	display: table-cell;
+	
 }
 
+#button-table {
+	display: table;	
+	border-spacing: 10px 0px;
+}
 
+#button-row {
+	display: table-row-group;
+}
+
 /*layout of adding a topic button */
 #content a.button-add-item {
 	background: url('../images/css/btn_add_off_rtl.gif') no-repeat top right;
 	color: #333;
 	border: 0px none;
 	padding:3px 25px 5px 15px;
 	font-size:11px;
-	display: table;
+	display: table-cell;
 	}
 
 #content a:hover.button-add-item {
@@ -402,7 +410,7 @@
 	padding-left: 15px;
 	padding-right: 25px;
 	font-size:11px;
-	display: table;
+	display: table-cell;
 }
 
 /************ The sequence name box **********/
@@ -435,7 +443,7 @@
 	color:#FF6666;
 	text-decoration: none;
 	border-bottom: 1px dotted #FF6666;
-	}
+}
 	
 	
 #content a:hover.disabled-sequence-name-link {
Index: lams_central/web/css/ie-styles_rtl.css
===================================================================
diff -u -rc6e66dab2d480ebede1f4b267127d44b3d857709 -rbb948b046fb4d5eb811a3a24c1ce7a47d5476d7e
--- lams_central/web/css/ie-styles_rtl.css	(.../ie-styles_rtl.css)	(revision c6e66dab2d480ebede1f4b267127d44b3d857709)
+++ lams_central/web/css/ie-styles_rtl.css	(.../ie-styles_rtl.css)	(revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e)
@@ -102,16 +102,17 @@
 	border: 0px none;
 	padding:5px 15px 6px 30px;
 	font-size:11px;
-	}
+	margin: 5px;
+}
 
 a:hover.button-add-item {
 	background: url('../images/css/btn_add_over_rtl.gif')no-repeat right top;
 	color: #349018;
 	border: 0px none;
 	padding:5px 15px 6px 30px;
 	font-size:11px;
-
-	}
+	margin: 5px;
+}
 	
 /*layout of a general button*/
 a.button {
@@ -120,8 +121,7 @@
 	border: 0px none;
 	padding:5px 15px 6px 15px;
 	font-size:11px;
-	display:table;
-	
+	margin: 5px;
 }
 
 a:hover.button {
@@ -130,13 +130,20 @@
 	border: 0px none;
 	padding:5px 15px 6px 15px;
 	font-size:11px;
-	display:table;
+	margin: 5px;
 }	
-	
-	
+
+#button-table {
+	display: block;
+}
+
+#button-row {
+	display: block;
+}
+
 #content {
 	padding-bottom:0px
-	}
+}
 	
 .right-buttons {float:left; padding-top:5px; padding-bottom:5px; margin-bottom:20px;}
 
Index: lams_central/web/css/ie7-styles_rtl.css
===================================================================
diff -u -r9f472790da7a14e3e9a717566d0f70cba1070781 -rbb948b046fb4d5eb811a3a24c1ce7a47d5476d7e
--- lams_central/web/css/ie7-styles_rtl.css	(.../ie7-styles_rtl.css)	(revision 9f472790da7a14e3e9a717566d0f70cba1070781)
+++ lams_central/web/css/ie7-styles_rtl.css	(.../ie7-styles_rtl.css)	(revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e)
@@ -14,4 +14,4 @@
 	margin-top: 0px;
 	float: left;
 	text-align: center;
-}
\ No newline at end of file
+}
Index: lams_tool_lamc/web/WEB-INF/lams.tld
===================================================================
diff -u -re4a1fb3c417f6227175bef9c7e20e985feec6a85 -rbb948b046fb4d5eb811a3a24c1ce7a47d5476d7e
--- lams_tool_lamc/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
+++ lams_tool_lamc/web/WEB-INF/lams.tld	(.../lams.tld)	(revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e)
@@ -430,5 +430,9 @@
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>ImgButtonWrapper</name>
+		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>  
 
 </taglib>
Index: lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag	(revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e)
@@ -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
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -rbb948b046fb4d5eb811a3a24c1ce7a47d5476d7e
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e)
@@ -240,16 +240,16 @@
 			</div>
 			<html:textarea property="feedback" rows="3" cols="70"></html:textarea>
 
-			<div class="space-bottom-top">
-				<a href="#" onclick="if (validateSingleCorrectAnswer()) { getElementById('newQuestionForm').submit(); }"
-					class="button-add-item"> <fmt:message key="label.add.new.question" />
-				</a>
+			<lams:ImgButtonWrapper>
+					<a href="#" onclick="if (validateSingleCorrectAnswer()) { getElementById('newQuestionForm').submit(); }"
+						class="button-add-item"> <fmt:message key="label.add.new.question" />
+					</a>
+	
+					<a href="#" onclick="javascript:window.parent.hideMessage()"
+						class="button space-left"> <fmt:message key="label.cancel" />
+					</a>
+			</lams:ImgButtonWrapper>
 
-				<a href="#" onclick="javascript:window.parent.hideMessage()"
-					class="button space-left"> <fmt:message key="label.cancel" />
-				</a>
-			</div>
-
 		</html:form>
 	</body>
 </lams:html>
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -rbb948b046fb4d5eb811a3a24c1ce7a47d5476d7e
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f)
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e)
@@ -25,7 +25,6 @@
 <lams:html>
 	<head>
 		<%@ include file="/common/header.jsp"%>
-		<lams:css style="tabbed" />
 
 		<script language="JavaScript" type="text/JavaScript">
 
@@ -193,7 +192,7 @@
 						<fmt:message key="label.add.candidates" />
 					</html:submit>
 				</div>
-
+				<div class="float-right">
 				<fmt:message key="label.questions.worth"></fmt:message>
 				<select name="mark">
 					<c:forEach var="markEntry"
@@ -210,23 +209,25 @@
 					</c:forEach>
 				</select>
 				<fmt:message key="label.marks"></fmt:message>
+				</div>
 			</div>
 
 			<div class="field-name">
 				<fmt:message key="label.feedback"></fmt:message>
 			</div>
 			<html:textarea property="feedback" rows="3" cols="70"></html:textarea>
 
-			<div class="space-bottom-top">
-				<a href="#" onclick="if (validateSingleCorrectAnswer()) { getElementById('newQuestionForm').submit(); }"				
-					class="button-add-item"> <fmt:message key="label.add.new.question" />
-				</a>
+			
+			<lams:ImgButtonWrapper>
+					<a href="#" onclick="if (validateSingleCorrectAnswer()) { getElementById('newQuestionForm').submit(); }"				
+						class="button-add-item"> <fmt:message key="label.add.new.question" />
+					</a>
+	
+					<a href="#" onclick="javascript:window.parent.hideMessage()"
+						class="button space-left"> <fmt:message key="label.cancel" />
+					</a>
+			</lams:ImgButtonWrapper>
 
-				<a href="#" onclick="javascript:window.parent.hideMessage()"
-					class="button space-left"> <fmt:message key="label.cancel" />
-				</a>
-			</div>
-
 		</html:form>
 	</body>
 </lams:html>