diff --git a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
index c374671ef..22bc6d40c 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
@@ -33,14 +33,14 @@
             <tabpanel>
                 <vbox sclass="mybox" width="100%">
                   <!-- Work report type details  -->
-                    <grid fixedLayout="false" width="100%">
+                    <grid fixedLayout="false" width="100%" span="1">
                         <columns>
                             <column width="200px" />
                             <column />
                         </columns>
                         <rows>
                             <row>
-                                <label value="${i18n:_('Name')}:" />
+                                <label value="${i18n:_('Name')}" />
                                 <hbox>
                                     <textbox visible = "@{controller.editable}"
                                         id="name" value="@{controller.workReportType.name}" width="300px"
@@ -51,7 +51,7 @@
                                 </hbox>
                             </row>
                             <row>
-                                <label value="${i18n:_('Code')}:" />
+                                <label value="${i18n:_('Code')}" />
                                 <hbox>
                                     <textbox visible = "@{controller.editable}"
                                         disabled="@{controller.workReportType.codeAutogenerated}"
@@ -66,7 +66,7 @@
                                 </hbox>
                             </row>
                             <row>
-                                <label value="${i18n:_('Date')}:" />
+                                <label value="${i18n:_('Date')}" />
                                 <hbox>
                                     <listbox visible = "@{controller.editable}"
                                         id="listDatePosition" mold="select" rows="1"
@@ -78,7 +78,7 @@
                                 </hbox>
                             </row>
                             <row>
-                            <label value="${i18n:_('Resource')}:" />
+                            <label value="${i18n:_('Resource')}" />
                             <hbox>
                                 <listbox visible = "@{controller.editable}"
                                     id="listResourcePosition" mold="select"
@@ -90,7 +90,7 @@
                             </hbox>
                             </row>
                             <row>
-                                <label value="${i18n:_('Task')}:" />
+                                <label value="${i18n:_('Task')}" />
                                 <hbox>
                                     <listbox visible = "@{controller.editable}"
                                         id="listOrderElementPosition" mold="select"
@@ -102,7 +102,7 @@
                                 </hbox>
                             </row>
                              <row>
-                                <label value="${i18n:_('Hours Management')}:" />
+                                <label value="${i18n:_('Hours Management')}" />
                                 <hbox>
                                     <listbox visible = "@{controller.editable}"
                                         id="listHoursManagement" mold="select"
@@ -118,9 +118,9 @@
                     <separator bar="false" spacing="90px" orient="vertical"/>
 
                 <!-- Description fields -->
-                <panel title="${i18n:_('Complementary text fields')}" border="normal"
-                    style="overflow:auto">
-                <panelchildren>
+                <groupbox closable="false">
+                    <caption label="${i18n:_('Complementary text fields')}" />
+
                 <hbox align="center" visible = "@{controller.editable}">
                     <separator bar="false" spacing="40px" orient="horizontal"/>
                     <separator bar="false" spacing="20px" orient="vertical"/>
@@ -131,20 +131,18 @@
                 <newdatasortablegrid id="listDescriptionFields" mold="paging" pageSize="4" fixedLayout="true"
                     model="@{controller.descriptionFields}" rowRenderer= "@{controller.descriptionFieldsRowRender}">
                     <columns>
-                      <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(fieldName))" sortDirection="ascending"/>
+                      <newdatasortablecolumn label="${i18n:_('Name')}" width="300px" sort="auto(lower(fieldName))" sortDirection="ascending"/>
                       <newdatasortablecolumn label="${i18n:_('Length')}" width="200px" align="center"/>
-                      <newdatasortablecolumn label="${i18n:_('Position')}" width="200px" align="center"/>
+                      <newdatasortablecolumn label="${ i18n:_('Position')}" width="200px" align="center"/>
                       <newdatasortablecolumn visible = "@{controller.editable}" label="${i18n:_('Operations')}" width="150px" align="center"/>
                     </columns>
                 </newdatasortablegrid>
-                </panelchildren>
-                </panel>
+                </groupbox>
                 <separator bar="false" spacing="90px" orient="vertical"/>
 
                 <!-- WorkReportLabelTypeAssigments -->
-                <panel title="${i18n:_('Label Type fields')}" border="normal"
-                    style="overflow:auto">
-                <panelchildren>
+                <groupbox closable="false">
+                <caption label="${i18n:_('Label Type fields')}" />
                 <hbox align="center" visible = "@{controller.editable}">
                     <separator bar="false" spacing="40px" orient="horizontal"/>
                     <separator bar="false" spacing="20px" orient="vertical"/>
@@ -161,8 +159,7 @@
                       <newdatasortablecolumn visible = "@{controller.editable}" label="${i18n:_('Operations')}" width="150px" align="center"/>
                     </columns>
                 </newdatasortablegrid>
-                </panelchildren>
-                </panel>
+                </groupbox>
                 <separator bar="false" spacing="100px" orient="vertical"/>
                 </vbox>
             </tabpanel>