Index: lams_central/conf/xdoclet/taglib-tag.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/taglib-tag.xml,v
diff -u -r1.10 -r1.11
--- lams_central/conf/xdoclet/taglib-tag.xml	12 Oct 2006 06:16:30 -0000	1.10
+++ lams_central/conf/xdoclet/taglib-tag.xml	6 Dec 2006 03:52:51 -0000	1.11
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.32 -r1.33
--- lams_central/web/WEB-INF/lams.tld	16 Nov 2006 05:10:02 -0000	1.32
+++ lams_central/web/WEB-INF/lams.tld	6 Dec 2006 03:52:50 -0000	1.33
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/ImgButtonWrapper.tag,v
diff -u
Binary files differ
Index: lams_central/web/css/defaultHTML_rtl.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_rtl.css,v
diff -u -r1.12 -r1.13
--- lams_central/web/css/defaultHTML_rtl.css	4 Dec 2006 08:11:41 -0000	1.12
+++ lams_central/web/css/defaultHTML_rtl.css	6 Dec 2006 03:52:50 -0000	1.13
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/ie-styles_rtl.css,v
diff -u -r1.6 -r1.7
--- lams_central/web/css/ie-styles_rtl.css	30 Nov 2006 05:20:07 -0000	1.6
+++ lams_central/web/css/ie-styles_rtl.css	6 Dec 2006 03:52:51 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/ie7-styles_rtl.css,v
diff -u -r1.2 -r1.3
--- lams_central/web/css/ie7-styles_rtl.css	4 Dec 2006 08:27:24 -0000	1.2
+++ lams_central/web/css/ie7-styles_rtl.css	6 Dec 2006 03:52:51 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.14 -r1.15
--- lams_tool_lamc/web/WEB-INF/lams.tld	16 Nov 2006 05:10:01 -0000	1.14
+++ lams_tool_lamc/web/WEB-INF/lams.tld	6 Dec 2006 03:52:49 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag,v
diff -u
Binary files differ
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/editQuestionBox.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	22 Nov 2006 06:30:09 -0000	1.11
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	6 Dec 2006 03:52:49 -0000	1.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/newQuestionBox.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	22 Nov 2006 06:30:09 -0000	1.11
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	6 Dec 2006 03:52:49 -0000	1.12
@@ -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>