Index: lams_tool_forum/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b -rea012d528901395e51a3a853d7553f2e3f89e444
--- lams_tool_forum/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b)
+++ lams_tool_forum/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision ea012d528901395e51a3a853d7553f2e3f89e444)
@@ -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_tool_lamc/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -rea012d528901395e51a3a853d7553f2e3f89e444
--- lams_tool_lamc/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_lamc/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision ea012d528901395e51a3a853d7553f2e3f89e444)
@@ -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_tool_laqa/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -rea012d528901395e51a3a853d7553f2e3f89e444
--- lams_tool_laqa/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_laqa/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision ea012d528901395e51a3a853d7553f2e3f89e444)
@@ -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_tool_larsrc/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r356eb906d0a80130e76929e9cd914b57304887ff -rea012d528901395e51a3a853d7553f2e3f89e444
--- lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 356eb906d0a80130e76929e9cd914b57304887ff)
+++ lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision ea012d528901395e51a3a853d7553f2e3f89e444)
@@ -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_tool_nb/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r0a9205737ad38f2cde57c92fbee07f8d895aaf44 -rea012d528901395e51a3a853d7553f2e3f89e444
--- lams_tool_nb/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
+++ lams_tool_nb/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision ea012d528901395e51a3a853d7553f2e3f89e444)
@@ -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_tool_sbmt/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -r29516de2d9ed294b03e1b886245e71266794e714 -rea012d528901395e51a3a853d7553f2e3f89e444
--- lams_tool_sbmt/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 29516de2d9ed294b03e1b886245e71266794e714)
+++ lams_tool_sbmt/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision ea012d528901395e51a3a853d7553f2e3f89e444)
@@ -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_tool_vote/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -rea012d528901395e51a3a853d7553f2e3f89e444
--- lams_tool_vote/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_vote/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision ea012d528901395e51a3a853d7553f2e3f89e444)
@@ -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>