diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
index fda915637..44e6d42c4 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
@@ -50,6 +50,7 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.event.InputEvent;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Button;
+import org.zkoss.zul.Caption;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Grid;
 import org.zkoss.zul.Listbox;
@@ -96,7 +97,7 @@ public class MaterialsController extends
 
     private Component messagesContainer;
 
-    private Panel materialsPanel;
+    private Caption materialsCaption;
 
     private UnitTypeListRenderer unitTypeListRenderer = new UnitTypeListRenderer();
 
@@ -483,11 +484,12 @@ public class MaterialsController extends
     private void refreshMaterialsListTitle() {
         Treeitem treeitem = categoriesTree.getSelectedItem();
         if (treeitem != null) {
-            materialsPanel.setTitle(_("List of materials for category: {0}",
+            materialsCaption.setLabel(_("List of materials for category: {0}",
                     ((MaterialCategory) treeitem.getValue()).getName()));
         }
         else {
-            materialsPanel.setTitle
+            materialsCaption
+                    .setLabel
                 (_("List of materials for all categories (select one to filter)"));
         }
     }
diff --git a/navalplanner-webapp/src/main/webapp/materials/materials.zul b/navalplanner-webapp/src/main/webapp/materials/materials.zul
index 92a9d0a6b..afe266c00 100644
--- a/navalplanner-webapp/src/main/webapp/materials/materials.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/materials.zul
@@ -30,14 +30,15 @@
 <zk>
     <window self="@{define(content)}"
         apply="org.navalplanner.web.materials.MaterialsController"
-        title="${i18n:_('Materials')}">
-        <vbox id="messagesContainer" />
+        title="${i18n:_('Materials')}" >
 
         <!-- Categories  -->
-        <hbox width="100%">
-            <panel title="${i18n:_('Categories')}"
-                border="normal">
-                <panelchildren>
+        <vbox width="100%">
+
+        <vbox id="messagesContainer" />
+
+            <groupbox closable="false">
+            <caption label="${i18n:_('Categories')}" />
                     <hbox>
                         <textbox id="txtCategory" onOK="materialsController.addMaterialCategory()"
                             style="padding-bottom: 4px" />
@@ -47,7 +48,6 @@
                         <button label="${i18n:_('Unselect')}" onClick="materialsController.clearSelectionCategoriesTree()" />
                     </hbox>
 
-                    <separator spacing="5px" orient="horizontal" />
 
                     <tree id="categoriesTree" zclass="z-dottree"
                         rows="5" vflex="true" multiple="false"
@@ -61,15 +61,14 @@
                             <treecol label="${i18n:_('Operations')}" width="80px" />
                         </treecols>
                     </tree>
-                </panelchildren>
-            </panel>
-        </hbox>
+                </groupbox>
+        </vbox>
 
         <!-- Materials -->
-        <hbox width="100%">
-            <panel title="${i18n:_('List of materials for all categories (select one to filter)')}"
-                id="materialsPanel" border="normal">
-                <panelchildren>
+        <vbox width="100%">
+
+        <groupbox closable="false">
+            <caption id="materialsCaption" label="${i18n:_('List of materials for all categories (select one to filter)')}"/>
                     <button id="btnAddMaterial"
                         label="${i18n:_('Add')}"
                         onClick="materialsController.addMaterialToMaterialCategory(categoriesTree.selectedItem)" />
@@ -107,10 +106,8 @@
                             </row>
                         </rows>
                     </newdatasortablegrid>
-
-                </panelchildren>
-            </panel>
-        </hbox>
+                </groupbox>
+        </vbox>
 
         <!-- Save button -->
         <button onClick="materialsController.saveAndContinue()"