diff --git a/gazelle-proxy-war/src/main/webapp/layout/edit.xhtml b/gazelle-proxy-war/src/main/webapp/layout/edit.xhtml
index 883c2c39cd9c4021448832ce2282cb086dbe55d6..b76a38139a5c2da1a6543f5697bbee2f56a058f8 100644
--- a/gazelle-proxy-war/src/main/webapp/layout/edit.xhtml
+++ b/gazelle-proxy-war/src/main/webapp/layout/edit.xhtml
@@ -4,24 +4,34 @@
                  xmlns:f="http://java.sun.com/jsf/core"
                  xmlns:s="http://jboss.com/products/seam/taglib">
 
-    <div class="prop">
-
-        <s:label styleClass="name #{invalid?'errors':''}">
+    <div id="editDiv" class="editDiv">
+	    
+	    
+	    <table id="tableEditTemplate" class="tableEditTemplate" border="0">
+	    <tr id="rowEditTemplate" class="rowEditTemplate">
+	    <td id="firstCell_NameColumn" class="nameColumn" >
+              
+        <s:label id="labelInvalidErrors" styleClass="name #{invalid?'errors':''}">
             <ui:insert name="label"/>
-            <s:span styleClass="required" rendered="#{required}">*</s:span>
+            <s:span id="labelInvalidErrorsSpan" styleClass="required" rendered="#{required}">*</s:span>
         </s:label>
-
-        <span class="value #{invalid?'errors':''}">
+        </td>
+        
+        <td id="secondCell_NameColumn">
+        <span id="spanInvalidErrors" class="value #{invalid?'errors':''}">
             <s:validateAll>
                 <ui:insert/>
             </s:validateAll>
         </span>
-
-        <span class="error">
-            <h:graphicImage value="/img/error.gif" rendered="#{invalid}" styleClass="errors"/>
-            <s:message styleClass="errors"/>
+        </td>
+        <td id="thirdCell_NameColumn">
+        <span id="spanError" class="error">
+            <h:graphicImage id="errorsNoBorderGraphicImage" value="/img/error.gif" rendered="#{invalid}" styleClass="errorsNoBorder"/>
+            <s:message id="errorsNoBorderMessage" styleClass="errorsNoBorder"/>
         </span>
-
+		 </td>
+	  </tr>
+	  </table>
     </div>
-
+    
 </ui:composition>
\ No newline at end of file