diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
index 37e9e346f..d58e382af 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
@@ -35,13 +35,13 @@ import java.util.Map;
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.LocalDate;
 import org.navalplanner.business.calendars.entities.BaseCalendar;
-import org.navalplanner.business.calendars.entities.BaseCalendar.DayType;
 import org.navalplanner.business.calendars.entities.CalendarAvailability;
 import org.navalplanner.business.calendars.entities.CalendarData;
-import org.navalplanner.business.calendars.entities.CalendarData.Days;
 import org.navalplanner.business.calendars.entities.CalendarException;
 import org.navalplanner.business.calendars.entities.CalendarExceptionType;
 import org.navalplanner.business.calendars.entities.ResourceCalendar;
+import org.navalplanner.business.calendars.entities.BaseCalendar.DayType;
+import org.navalplanner.business.calendars.entities.CalendarData.Days;
 import org.navalplanner.business.workingday.EffortDuration;
 import org.navalplanner.business.workingday.EffortDuration.Granularity;
 import org.navalplanner.web.common.Util;
@@ -629,10 +629,6 @@ public abstract class BaseCalendarEditionController extends
             CalendarData calendarData = (CalendarData) data;
             item.setValue(calendarData);
 
-            Listcell nameListcell = new Listcell();
-            nameListcell.appendChild(new Label(baseCalendarModel.getName()));
-            item.appendChild(nameListcell);
-
             Listcell parentListcell = new Listcell();
             Label parentLabel = new Label();
             BaseCalendar parent = calendarData.getParent();
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
index 2a76573a4..0b9ba9617 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
@@ -147,9 +147,9 @@
                         model="@{calendarController.editionController.getHoursPerDay}"
                         itemRenderer="@{calendarController.editionController.hoursPerDayRenderer}">
                         <listhead>
-                            <listheader label="${i18n:_('Day of week')}" />
-                            <listheader label="${i18n:_('Workable Time')}" />
-                            <listheader label="${i18n:_('By default')}" />
+                            <listheader label="${i18n:_('Day of week')}" width="80px"/>
+                            <listheader label="${i18n:_('Workable Time')}" width="160px"/>
+                            <listheader label="${i18n:_('Inh.')}" width="30px" tooltiptext="${i18n:_('Inherited from parent calendar')}" />
                         </listhead>
                     </listbox>
 
@@ -157,12 +157,11 @@
                         model="@{calendarController.editionController.historyVersions}"
                         itemRenderer="@{calendarController.editionController.historyVersionsRenderer}">
                         <listhead>
-                            <listheader label="${i18n:_('Name')}" />
-                            <listheader label="${i18n:_('Parent')}" />
-                            <listheader label="${i18n:_('Valid from')}" />
-                            <listheader label="${i18n:_('Expiry date')}" />
-                            <listheader label="${i18n:_('Summary')}" />
-                            <listheader label="${i18n:_('Operations')}" />
+                            <listheader label="${i18n:_('Parent')}" width="80px"/>
+                            <listheader label="${i18n:_('Valid from')}" width="80px"/>
+                            <listheader label="${i18n:_('Expiry date')}" width="80px"/>
+                            <listheader label="${i18n:_('Summary')}" width="180px"/>
+                            <listheader label="${i18n:_('Op.')}" tooltiptext="${i18n:_('Operations')}" width="50px"/>
                         </listhead>
                     </listbox>