diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
index 0df3bf3b1..a9565b59b 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
@@ -20,7 +20,6 @@
 
 package org.navalplanner.business.resources.entities;
 
-import static org.navalplanner.business.i18n.I18nHelper._;
 import static org.navalplanner.business.workingday.EffortDuration.zero;
 
 import java.util.ArrayList;
@@ -1150,10 +1149,6 @@ public abstract class Resource extends IntegrationEntity {
         this.limitingResource = limitingResource;
     }
 
-    public String getLimitingResourceAsString() {
-        return (Boolean.TRUE.equals(isLimitingResource())) ? _("yes") : _("no");
-    }
-
     public LimitingResourceQueue getLimitingResourceQueue() {
         return limitingResourceQueue;
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
index e4b116a3e..79bdc6d85 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
@@ -55,6 +55,8 @@ import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.CheckEvent;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
@@ -62,10 +64,14 @@ import org.zkoss.zul.ComboitemRenderer;
 import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Grid;
+import org.zkoss.zul.Hbox;
+import org.zkoss.zul.Label;
 import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.Messagebox;
+import org.zkoss.zul.Row;
+import org.zkoss.zul.RowRenderer;
 import org.zkoss.zul.SimpleListModel;
 import org.zkoss.zul.Tab;
 import org.zkoss.zul.Textbox;
@@ -632,4 +638,46 @@ public class MachineCRUDController extends GenericForwardComposer {
                     Level.INFO, _("This machine was already removed by other user"));
         }
     }
+
+    public RowRenderer getMachinesRenderer() {
+        return new RowRenderer() {
+
+            @Override
+            public void render(Row row, Object data) throws Exception {
+                final Machine machine = (Machine) data;
+                row.setValue(machine);
+
+                row.addEventListener(Events.ON_DOUBLE_CLICK,
+                        new EventListener() {
+                            @Override
+                            public void onEvent(Event event) throws Exception {
+                                goToEditForm(machine);
+                            }
+                        });
+
+                row.appendChild(new Label(machine.getName()));
+                row.appendChild(new Label(machine.getDescription()));
+                row.appendChild(new Label(machine.getCode()));
+                row.appendChild(new Label((Boolean.TRUE.equals(machine
+                        .isLimitingResource())) ? _("yes") : _("no")));
+
+                Hbox hbox = new Hbox();
+                hbox.appendChild(Util.createEditButton(new EventListener() {
+                    @Override
+                    public void onEvent(Event event) throws Exception {
+                        goToEditForm(machine);
+                    }
+                }));
+                hbox.appendChild(Util.createRemoveButton(new EventListener() {
+                    @Override
+                    public void onEvent(Event event) throws Exception {
+                        confirmRemove(machine);
+                    }
+                }));
+                row.appendChild(hbox);
+            }
+
+        };
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
index 9275669d4..eb5b39e58 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
@@ -35,7 +35,6 @@ import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.resources.entities.VirtualWorker;
 import org.navalplanner.business.resources.entities.Worker;
-import org.navalplanner.web.I18nHelper;
 import org.navalplanner.web.calendars.BaseCalendarEditionController;
 import org.navalplanner.web.calendars.IBaseCalendarModel;
 import org.navalplanner.web.common.ConstraintChecker;
@@ -54,6 +53,8 @@ import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.CheckEvent;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
@@ -61,10 +62,14 @@ import org.zkoss.zul.ComboitemRenderer;
 import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Grid;
+import org.zkoss.zul.Hbox;
+import org.zkoss.zul.Label;
 import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.Messagebox;
+import org.zkoss.zul.Row;
+import org.zkoss.zul.RowRenderer;
 import org.zkoss.zul.SimpleListModel;
 import org.zkoss.zul.Tab;
 import org.zkoss.zul.Textbox;
@@ -671,7 +676,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
         }
 
         public String toString() {
-            return I18nHelper._(option);
+            return _(option);
         }
 
         public static LimitingResourceEnum valueOf(Boolean isLimitingResource) {
@@ -773,4 +778,47 @@ public class WorkerCRUDController extends GenericForwardComposer implements
                     Level.INFO, _("This worker was already removed by other user"));
         }
     }
+
+    public RowRenderer getWorkersRenderer() {
+        return new RowRenderer() {
+
+            @Override
+            public void render(Row row, Object data) throws Exception {
+                final Worker worker = (Worker) data;
+                row.setValue(worker);
+
+                row.addEventListener(Events.ON_DOUBLE_CLICK,
+                        new EventListener() {
+                            @Override
+                            public void onEvent(Event event) throws Exception {
+                                goToEditForm(worker);
+                            }
+                        });
+
+                row.appendChild(new Label(worker.getSurname()));
+                row.appendChild(new Label(worker.getFirstName()));
+                row.appendChild(new Label(worker.getNif()));
+                row.appendChild(new Label(worker.getCode()));
+                row.appendChild(new Label((Boolean.TRUE.equals(worker
+                        .isLimitingResource())) ? _("yes") : _("no")));
+
+                Hbox hbox = new Hbox();
+                hbox.appendChild(Util.createEditButton(new EventListener() {
+                    @Override
+                    public void onEvent(Event event) throws Exception {
+                        goToEditForm(worker);
+                    }
+                }));
+                hbox.appendChild(Util.createRemoveButton(new EventListener() {
+                    @Override
+                    public void onEvent(Event event) throws Exception {
+                        confirmRemove(worker);
+                    }
+                }));
+                row.appendChild(hbox);
+            }
+
+        };
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
index f3299423a..b6c9f6500 100644
--- a/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
@@ -28,6 +28,7 @@
     <separator bar="false" spacing="5px" orient="horizontal"/>
 
     <newdatasortablegrid id="listing" model="@{controller.machines}" mold="paging"
+        rowRenderer="@{controller.machinesRenderer}"
         pageSize="10" fixedLayout="true" sclass="clickable-rows">
         <columns>
             <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="ascending" />
@@ -36,26 +37,6 @@
             <newdatasortablecolumn label="${i18n:_('Limiting')}" sort="auto(limitingResource)" width="90px"/>
             <newdatasortablecolumn label="${i18n:_('Operations')}" width="90px"/>
         </columns>
-        <rows>
-            <row self="@{each='machine'}" value="@{machine}" onDoubleClick="controller.goToEditForm(self.value);">
-                <label value="@{machine.name}" />
-                <label value="@{machine.description}" />
-                <label value="@{machine.code}" />
-                <label value="@{machine.limitingResourceAsString}" />
-                <hbox>
-                    <button sclass="icono" image="/common/img/ico_editar1.png"
-                        hoverImage="/common/img/ico_editar.png"
-                        tooltiptext="${i18n:_('Edit')}"
-                        onClick="controller.goToEditForm(self.getParent().getParent().value);">
-                    </button>
-                    <button sclass="icono" image="/common/img/ico_borrar1.png"
-                        hoverImage="/common/img/ico_borrar.png"
-                        tooltiptext="${i18n:_('Delete')}"
-                        onClick="controller.confirmRemove(self.parent.parent.value);"/>
-
-                </hbox>
-            </row>
-        </rows>
     </newdatasortablegrid>
     <button id="show_create_form" onClick="controller.goToCreateForm();"
         label="${i18n:_('Create')}" sclass="create-button global-action">
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
index ad3097e17..a487de62b 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
@@ -28,6 +28,7 @@
     <separator bar="false" spacing="5px" orient="horizontal"/>
 
     <newdatasortablegrid id="listing" model="@{controller.realWorkers}" mold="paging"
+        rowRenderer="@{controller.workersRenderer}"
         pageSize="10" fixedLayout="true" sclass="clickable-rows">
         <columns>
             <newdatasortablecolumn label="${i18n:_('Surname')}" sort="auto(lower(surname))" sortDirection="ascending" />
@@ -37,27 +38,6 @@
             <newdatasortablecolumn label="${i18n:_('Limiting')}" sort="auto(limitingResource)" width="90px"/>
             <newdatasortablecolumn label="${i18n:_('Operations')}" width="90px"/>
         </columns>
-        <rows>
-            <row self="@{each='worker'}" value="@{worker}" onDoubleClick="controller.goToEditForm(self.value);">
-                <label value="@{worker.surname}" />
-                <label value="@{worker.firstName}" />
-                <label value="@{worker.nif}" />
-                <label value="@{worker.code}" />
-                <label value="@{worker.limitingResourceAsString}" />
-                <hbox>
-                    <button sclass="icono" image="/common/img/ico_editar1.png"
-                        hoverImage="/common/img/ico_editar.png"
-                        tooltiptext="${i18n:_('Edit')}"
-                        onClick="controller.goToEditForm(self.getParent().getParent().value);">
-                    </button>
-                    <button sclass="icono" image="/common/img/ico_borrar1.png"
-                        hoverImage="/common/img/ico_borrar.png"
-                        tooltiptext="${i18n:_('Delete')}"
-                        onClick="controller.confirmRemove(self.parent.parent.value);"/>
-
-                </hbox>
-            </row>
-        </rows>
     </newdatasortablegrid>
 
     <button id="show_create_form" onClick="controller.goToCreateForm();"