diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
index f5079b6ae..f3bbee84d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
@@ -73,6 +73,7 @@ import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
+import org.zkoss.zkex.zul.LayoutRegion;
 import org.zkoss.zul.Button;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
@@ -369,9 +370,9 @@ public class AdvancedAllocationController extends GenericForwardComposer {
     }
 
     private IMessagesForUser messages;
-    private Div insertionPointTimetracker;
+    private LayoutRegion insertionPointTimetracker;
     private Div insertionPointLeftPanel;
-    private Div insertionPointRightPanel;
+    private LayoutRegion insertionPointRightPanel;
 
     private Button paginationDownButton;
     private Button paginationUpButton;
@@ -416,7 +417,6 @@ public class AdvancedAllocationController extends GenericForwardComposer {
         Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();");
     }
 
-
     private void loadAndInitializeComponents() {
         messages = new MessagesForUser(associatedComponent
                 .getFellow("messages"));
@@ -446,13 +446,13 @@ public class AdvancedAllocationController extends GenericForwardComposer {
             case DETAIL_ONE:
                 return Period.years(5);
             case DETAIL_TWO:
-                return Period.years(3);
+                return Period.years(5);
             case DETAIL_THREE:
                 return Period.years(2);
             case DETAIL_FOUR:
                 return Period.months(6);
             case DETAIL_FIVE:
-                return Period.months(2);
+                return Period.weeks(6);
             }
             return Period.years(5);
         }
@@ -544,8 +544,7 @@ public class AdvancedAllocationController extends GenericForwardComposer {
                 paginatorFilter.setZoomLevel(detailLevel);
                 paginatorFilter.setInterval(timeTracker.getRealInterval());
                 timeTracker.setFilter(paginatorFilter);
-                Clients
-                        .evalJavaScript("ADVANCE_ALLOCATIONS.listenToHorizontalScroll();");
+                Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();");
             }
         });
         timeTrackerComponent = new TimeTrackerComponentWithoutColumns(
@@ -558,8 +557,6 @@ public class AdvancedAllocationController extends GenericForwardComposer {
         leftPane = timeTrackedTableWithLeftPane.getLeftPane();
         leftPane.setFixedLayout(true);
         Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();");
-        Clients
-                .evalJavaScript("ADVANCE_ALLOCATIONS.listenToHorizontalScroll();");
     }
 
     public void paginationDown() {
@@ -582,12 +579,10 @@ public class AdvancedAllocationController extends GenericForwardComposer {
                 paginatorFilter.setZoomLevel(detailLevel);
                 paginatorFilter.setInterval(timeTracker.getRealInterval());
                 timeTracker.setFilter(paginatorFilter);
-                Clients
-                        .evalJavaScript("ADVANCE_ALLOCATIONS.listenToHorizontalScroll();");
+                Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();");
             }
         });
-        Clients
-                .evalJavaScript("ADVANCE_ALLOCATIONS.listenToHorizontalScroll();");
+        Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();");
     }
 
     public boolean isFirstPage() {
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
index 7a3f37486..9ba5659c9 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -1231,10 +1231,8 @@ tr.z-tree-row-seld, tr.z-list-item-seld,
 .timeTrackedTableWithLeftPane .z-grid-body table {
    position:relative;
 }
-
-/* Test*/
 .timeTrackedTableWithLeftPane div.z-grid-body {
-overflow: hidden;
+overflow: visible;
 }
 
 .advancedallocationlayout #timeTracker .z-vbox {
@@ -1249,3 +1247,17 @@ overflow: hidden;
     background-color: #CDE6F5;
 }
 
+
+/* Advanced allocation */
+
+.advancedallocationlayout #timeTrackedTableWithLeftPane div.z-grid {
+    overflow:auto;
+}
+
+.advancedallocationlayout .timetrackergap {
+     overflow: visible;
+}
+
+.timeTrackedTableWithLeftPane .z-grid-body .z-row-inner {
+    background-color: #E8E8E8;
+}
diff --git a/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js b/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js
index 4ffdc4d40..fc374f572 100644
--- a/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js
+++ b/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js
@@ -22,30 +22,17 @@
 ADVANCE_ALLOCATIONS = {};
 
 ADVANCE_ALLOCATIONS.listenToScroll = function() {
-//     var timetrackergap_ = YAHOO.util.Selector.query('#timeTracker .z-vbox')[0];
-//    var taskspanel_ = YAHOO.util.Selector.query('.rightpanellayout .z-grid-body')[0];
+	var scrollableArea_ = YAHOO.util.Selector.query('.advanced-assignment-area')[0];
+	var innerScrollableArea_ = YAHOO.util.Selector.query('.advanced-assignment-area .z-center-body')[0];
     var taskdetails_ = YAHOO.util.Selector.query('.advancedassignmentdetails .z-grid-body')[0];
-    var taskspanelcenter_ = YAHOO.util.Selector.query('.rightpanellayout')[0];
+    var timetrackergap_ = YAHOO.util.Selector.query('.timetrackergap')[0];
+    var timetracker_ = YAHOO.util.Selector.query('#timeTracker .z-vbox')[0];
 
-    var onVerticalScroll = function() {
-        taskdetails_.style["top"] = "-" + taskspanelcenter_.scrollTop + "px";
+    var onScroll = function() {
+        taskdetails_.style["top"] = "-" + scrollableArea_.scrollTop + "px";
+        timetrackergap_.style["left"] = "-" + scrollableArea_.scrollLeft + "px";
     };
-    taskspanelcenter_.onscroll = onVerticalScroll;
-};
-
-
-ADVANCE_ALLOCATIONS.listenToHorizontalScroll = function() {
-	var horizontalScroll_ = YAHOO.util.Selector.query('.horizontalscroller')[0];
-    var timeTrackedTable_ = YAHOO.util.Selector.query('.timeTrackedTableWithLeftPane .z-grid-body table')[0];
-    var timetrackergap_ = YAHOO.util.Selector.query('#timeTracker .z-vbox')[0];
-    var innerScroll_ = YAHOO.util.Selector.query('#horizontalScrollContainer')[0];
-
-	var onHorizontalScroll = function() {
-		timeTrackedTable_.style["left"] = "-" + horizontalScroll_.scrollLeft + "px";
-        timetrackergap_.style["left"] = "-" + horizontalScroll_.scrollLeft + "px";
-    };
-
-    innerScroll_.style["width"] = (timeTrackedTable_.clientWidth + 10 ) +"px";
-    horizontalScroll_.scrollLeft = "0";
-    horizontalScroll_.onscroll = onHorizontalScroll;
+	scrollableArea_.onscroll = onScroll;
+
+	innerScrollableArea_.style["width"] = timetracker_.clientWidth + "px";
 };
diff --git a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
index ca40688ac..90c0153d3 100644
--- a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
@@ -56,7 +56,7 @@
    </north>
 
     <center border="0">
-        <borderlayout sclass="resourcesload">
+        <borderlayout>
             <west size="400px" flex="true" collapsible="true"
                 splittable="true" sclass="advancedassignmentdetails">
                         <div sclass="leftpanelgap" id="insertionPointLeftPanel"></div>
@@ -64,13 +64,8 @@
 
             <center sclass="taskspanel">
                 <borderlayout>
-                    <north border="0"><div sclass="timetrackergap" height="31px" id="insertionPointTimetracker"></div></north>
-                    <center style="overflow-y:auto;overflow-x:hidden;" border="0" sclass="rightpanellayout">
-                        <div id="insertionPointRightPanel" sclass="taskspanelgap"></div>
-                    </center>
-                    <south border="0" sclass="horizontalscroller" height="16px" style="overflow-x:auto;overflow-y:hidden;">
-                        <n:div id="horizontalScrollContainer" style="height:10px;" />
-                    </south>
+                    <north border="0" sclass="timetrackergap" height="31px" id="insertionPointTimetracker" />
+                    <center style="overflow-y:auto;overflow-x:auto;" border="0" sclass="advanced-assignment-area rightpanellayout taskspanelgap" id="insertionPointRightPanel" />
                 </borderlayout>
             </center>
         </borderlayout>