Index: lams_central/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r7bae73b8a064d9ae6ba04f040569930928c64e2c -r17530064bb3affbd520737dce730b8480d02cef7
--- lams_central/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 7bae73b8a064d9ae6ba04f040569930928c64e2c)
+++ lams_central/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 17530064bb3affbd520737dce730b8480d02cef7)
@@ -34,7 +34,8 @@
 <%@ attribute name="text" required="true" rtexprvalue="true"%>
 <%@ attribute name="small" required="false" rtexprvalue="true"%>
 <%@ attribute name="key" required="false" rtexprvalue="true"%>
-<%@ attribute name="alt" required="false" rtexprvalue="true"%> <!--  default true -->
+<%@ attribute name="alt" required="false" rtexprvalue="true"%>
+<!--  default true -->
 
 <%@ taglib uri="tags-function" prefix="fn"%>
 <%@ taglib uri="tags-core" prefix="c"%>
@@ -60,31 +61,36 @@
 
 <c:set var="fieldName" value="field-name" />
 <c:if test="${alt}">
-<c:set var="fieldName" value="field-name-alternative-color" />
+	<c:set var="fieldName" value="field-name-alternative-color" />
 </c:if>
 
 <div id="preview${id}" style="visibility: hidden; display: none;">
 	<div>
-		<p class="button">
+		<div class="${fieldName} left-buttons">
 			<c:if test="${key != null}">
-				<span class="${fieldName}"><fmt:message key="${key}" /></span>
+				<fmt:message key="${key}" />
 			</c:if>
+		</div>
+		<div class="button right-buttons">
 			<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)" class="button-html-editor">HTML Editor</a>
-		</p>
+		</div>
 	</div>
+	<br>
 	<div class="${previewClassName}" id="preview${id}.text"></div>
 </div>
 
 
 <div id="tx${id}">
 	<div>
-
-		<p class="button">
+		<div class="${fieldName} left-buttons">
 			<c:if test="${key != null}">
-				<span class="${fieldName}"><fmt:message key="${key}" /></span>
+				<fmt:message key="${key}" />
 			</c:if>
+		</div>
+		<div class="button right-buttons">
 			<a href="javascript:doTextToHTML('${id}');doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)" class="button-html-editor">HTML Editor</a>
-		</p>
+		</div>
 	</div>
+	<br>
 	<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
 </div>
Index: lams_central/web/css/fckeditor_style.css
===================================================================
diff -u -re3f2f4a1fd2fbab688a0de1b2eb4a5387f8c783c -r17530064bb3affbd520737dce730b8480d02cef7
--- lams_central/web/css/fckeditor_style.css	(.../fckeditor_style.css)	(revision e3f2f4a1fd2fbab688a0de1b2eb4a5387f8c783c)
+++ lams_central/web/css/fckeditor_style.css	(.../fckeditor_style.css)	(revision 17530064bb3affbd520737dce730b8480d02cef7)
@@ -1,34 +1,42 @@
 .previewPanel {
-	width: 665px;
+	width: 625px;
 	height: 220px;
 	border-style: none;
 	border-width: 1px;
 	padding: 5px;
 	overflow: auto;
+	margin-left: 20px;
+	margin-top: 12px;
 }
 
 .textareaPanel {
-	width: 665px;
+	width: 625px;
 	height: 220px;
+	margin-left: 20px;
+		margin-top: 12px;
 }
 
 .smallPreviewPanel {
-	width: 665px;
+	width: 625px;
 	height: 80px;
 	border-style: none;
 	border-width: 1px;
 	padding: 5px;
+	margin-left: 20px;
+	margin-top: 12px;
 }
 
 .smallTextareaPanel {
-	width: 665px;
+	width: 625px;
 	height: 80px;
+	margin-left: 20px;
+		margin-top: 12px;
 }
 
 
 #wyswygEditorScreen {
 	position: absolute;
-	width: 665px;
+	width: 625px;
 	height: 220px;
 	padding: 0px;
 	margin: 0px;
Index: lams_tool_chat/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r7bae73b8a064d9ae6ba04f040569930928c64e2c -r17530064bb3affbd520737dce730b8480d02cef7
--- lams_tool_chat/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 7bae73b8a064d9ae6ba04f040569930928c64e2c)
+++ lams_tool_chat/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 17530064bb3affbd520737dce730b8480d02cef7)
@@ -34,7 +34,8 @@
 <%@ attribute name="text" required="true" rtexprvalue="true"%>
 <%@ attribute name="small" required="false" rtexprvalue="true"%>
 <%@ attribute name="key" required="false" rtexprvalue="true"%>
-<%@ attribute name="alt" required="false" rtexprvalue="true"%> <!--  default true -->
+<%@ attribute name="alt" required="false" rtexprvalue="true"%>
+<!--  default true -->
 
 <%@ taglib uri="tags-function" prefix="fn"%>
 <%@ taglib uri="tags-core" prefix="c"%>
@@ -60,31 +61,36 @@
 
 <c:set var="fieldName" value="field-name" />
 <c:if test="${alt}">
-<c:set var="fieldName" value="field-name-alternative-color" />
+	<c:set var="fieldName" value="field-name-alternative-color" />
 </c:if>
 
 <div id="preview${id}" style="visibility: hidden; display: none;">
 	<div>
-		<p class="button">
+		<div class="${fieldName} left-buttons">
 			<c:if test="${key != null}">
-				<span class="${fieldName}"><fmt:message key="${key}" /></span>
+				<fmt:message key="${key}" />
 			</c:if>
+		</div>
+		<div class="button right-buttons">
 			<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)" class="button-html-editor">HTML Editor</a>
-		</p>
+		</div>
 	</div>
+	<br>
 	<div class="${previewClassName}" id="preview${id}.text"></div>
 </div>
 
 
 <div id="tx${id}">
 	<div>
-
-		<p class="button">
+		<div class="${fieldName} left-buttons">
 			<c:if test="${key != null}">
-				<span class="${fieldName}"><fmt:message key="${key}" /></span>
+				<fmt:message key="${key}" />
 			</c:if>
+		</div>
+		<div class="button right-buttons">
 			<a href="javascript:doTextToHTML('${id}');doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)" class="button-html-editor">HTML Editor</a>
-		</p>
+		</div>
 	</div>
+	<br>
 	<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
 </div>