diff --git a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js
index 5c914ffb3..471126511 100644
--- a/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js
+++ b/navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js
@@ -7,14 +7,14 @@
 zkTasklist = {};
 
 HEIGHT_PER_ROW = 15;             // Ganttz task row height
-HEIGHT_TIME_TRACKER = 200;       //200
+HEIGHT_TIME_TRACKER = -10;        // Timetracker legend height (80)
 
 MIN_RESOLUTION_X = 600;          // Minimun horizontal autoresizable window
 MIN_RESOLUTION_Y = 600;          // Minimun vertical autoresizable window
 
 TASKDETAILS_WIDTH = 300;         // Taskdetails column fixed width (300)
-TASKDETAILS_HEIGHT = 260;        // Design-relative reservated height for taskdetails (300)
-TIMETRACKER_OFFSET_TOP = 200     // Design-relative height above timetracker
+TASKDETAILS_HEIGHT = 180; //260       // Design-relative reservated height for taskdetails (300,260)
+TIMETRACKER_OFFSET_TOP = 120 //    // Design-relative height above timetracker
 
 FOOTER_HEIGHT = 40;             // Design-relative footer height
 
@@ -26,22 +26,6 @@ zkTasklist.init = function(cmp) {
 }
 
 zkTasklist.adjust_height = function(cmp) {
-/*    var height = cmp.style.height;
-      var component_to_adjust = document.getElementById(cmp
-            .getAttribute('sameHeightElementId'));
-
-    function setHeight(element, offset) {
-        if (!offset) {
-            offset = 0;
-        }
-        var newheigth = parseInt(height) + offset;
-        element.style["height"] = document.getElementById('scroll_container').style["height"];
-    }
-    setHeight(document.getElementById('ganttpanel'), HEIGHT_TIME_TRACKER);
-
-    if (component_to_adjust) {
-        setHeight(component_to_adjust);
-    } */
 
     document.getElementById('ganttpanel').style["height"]
         = document.getElementById('scroll_container').style["height"];
@@ -87,14 +71,14 @@ function relocateScrolls() {
     // Shift scroll-y and scroll-x width (Width change)
     if ( window.innerWidth > MIN_RESOLUTION_X ) {
         scroller_y.style["left"] =
-            (window.innerWidth - SCROLLBAR_WIDTH -5 ) +"px"; // Extra padding
+            (window.innerWidth - SCROLLBAR_WIDTH*3 ) +"px"; // Extra padding
         scroller_x.style["width"] =
-            (window.innerWidth - TASKDETAILS_WIDTH - SCROLLBAR_WIDTH +5 ) +"px"; // Extra padding
+            (window.innerWidth - TASKDETAILS_WIDTH - SCROLLBAR_WIDTH*2 ) +"px"; // Extra padding
     }
 
     // Shift scroll-y and scroll-x width (Height change)
     if ( window.innerHeight > MIN_RESOLUTION_Y ) {
-        scroller_x.style["top"] = (window.innerHeight - SCROLLBAR_WIDTH*2 - FOOTER_HEIGHT) +"px";
+        scroller_x.style["top"] = (window.innerHeight - SCROLLBAR_WIDTH*2 - HEIGHT_TIME_TRACKER ) +"px";
         scroller_y.style["height"] = (window.innerHeight - TASKDETAILS_HEIGHT ) +"px";
         listdetails.style["height"] = scroller_y.style["height"];
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
index 027e35b32..ba1e53072 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
@@ -91,11 +91,7 @@ public class CustomMenuController extends Div {
 				"/navalplanner-webapp/");
 		l.add(ci);
 
-		ci = new CustomMenuItem("mainmenu.quality_management",
-				"/navalplanner-webapp/");
-		l.add(ci);
-
-		ci = new CustomMenuItem("mainmenu.quality_management",
+		ci = new CustomMenuItem("mainmenu.administration",
 				"/navalplanner-webapp/");
 		l.add(ci);
 
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index e1c717184..39602d147 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -29,15 +29,15 @@ zkTasklist.SCROLLBAR_WIDTH = 15
     float:left;
     height:300px;
     position:relative;
-    top:25px;
+    top:27px;
     overflow-y: hidden;
     border-bottom: 1px solid #86A4BE;
     border-right: 1px solid #86A4BE;
 }
 
-/*.listdetails img {
+.listdetails img {
     display:none;
-} */
+}
 
 #listdetails_container td {
     border-bottom:1px solid #86A4BE;
@@ -81,7 +81,7 @@ border:0px;
 
 .taskdetail_grid table {
     height:30px;
-    width:280px; /* Ganntz.ListdetailsWidth */
+    width:285px; /* Ganntz.ListdetailsWidth */
 }
 
 
@@ -241,20 +241,19 @@ table {
 
 #scroll_container {
     margin-top:70px;
-    /*    border:solid green 1px; */
-    height:300px; /* Recalculate based on window */
-    width:500px; /* Recalculate based on window */
+    height:300px; /* Recalculated based on window */
+    width:500px; /* Recalculated based on window */
     overflow:hidden;
     float:left;
     position:absolute;
-    left:300px;
-
+    left:285px; /* Ganntz.ListdetailsWidth + borders = 280 + 5 */
+    /*    border:solid green 1px; */
 }
 
 #timetracker {
     /* border: solid 1px red; */
     position:absolute;
-    left:300px;
+    left:285px; /* Ganntz.ListdetailsWidth + borders = 280 + 5 */
     width:600px;
     height:400px;
     position:absolute;
@@ -278,7 +277,7 @@ tr.z-vbox-sep {
 
 #ganttpanel_scroller_x {
     top: 600px;  /* Calculate initial settings */
-    left: 290px;
+    left: 285px; /* Ganntz.ListdetailsWidth + borders = 280 + 5 */
     width:635px;
     height:15px;
 }
@@ -290,7 +289,7 @@ tr.z-vbox-sep {
 }
 
 #ganttpanel_scroller_y {
-    top: 195px; /* Calculate initial settings */
+    top: 160px; /* Fixed top position */
     left: 920px;
     width:15px;
     height:330px;