diff --git a/Frame.js b/Frame.js
index 93a4627e0..a2a541bef 100644
--- a/Frame.js
+++ b/Frame.js
@@ -397,6 +397,11 @@ function newFrame () {
   function borders () {
         /* Lest get the important points of the drawing so as to apply the needed transformations. */
 
+    let point1
+    let point2
+    let point3
+    let point4
+
     point1 = {
       x: 0,
       y: 0
diff --git a/Scales/TimeScale.js b/Scales/TimeScale.js
index 5e8dba0f1..8c0087f2c 100644
--- a/Scales/TimeScale.js
+++ b/Scales/TimeScale.js
@@ -15,18 +15,13 @@ function newTimeScale () {
   }
 
   const LENGHT_PERCENTAGE_DEFAULT_VALUE = 50
-  const RIGHT_MARGIN = 50
   const STEP_SIZE = 5
+  const MIN_HEIGHT = 50
+  const TOP_MARGIN = 15
 
   thisObject.container = newContainer()
   thisObject.container.initialize(MODULE_NAME)
 
-  thisObject.container.frame.width = viewPort.visibleArea.bottomRight.x - viewPort.visibleArea.topLeft.x
-  thisObject.container.frame.height = 100
-
-  thisObject.container.frame.position.x = viewPort.visibleArea.bottomRight.x
-  thisObject.container.frame.position.y = TOP_SPACE_HEIGHT
-
   thisObject.container.isDraggeable = false
   thisObject.container.isClickeable = false
   thisObject.container.isWheelable = true
@@ -64,10 +59,16 @@ function newTimeScale () {
     window.localStorage.setItem(MODULE_NAME, thisObject.lenghtPercentage)
   }
 
-  function getContainer (point) {
+  function getContainer (pPoint) {
     let container
 
-       /* First we check if this point is inside this object UI. */
+/* In this case we manually frame this point since we do a very special treatment of the position of this scale. */
+    let point = {
+      x: 0,
+      y: 0
+    }
+    point.x = pPoint.x - thisObject.container.frame.position.x
+    point.y = pPoint.y - thisObject.container.frame.position.y + TOP_MARGIN
 
     if (thisObject.container.frame.isThisPointHere(point, undefined, true) === true) {
       return thisObject.container
@@ -79,6 +80,72 @@ function newTimeScale () {
   }
 
   function draw () {
+/* We need this scale to match the shape of its parent when the parent is inside the viewPort, when it is not, we need the scale still
+to be visible at the top of the viewPort. */
 
+    let frame = thisObject.container.parentContainer.frame
+    let point1
+    let point2
+    let point3
+    let point4
+
+    point1 = {
+      x: 0,
+      y: 0
+    }
+
+    point2 = {
+      x: frame.width,
+      y: 0
+    }
+
+    point3 = {
+      x: frame.width,
+      y: frame.height / 10
+    }
+
+    point4 = {
+      x: 0,
+      y: frame.height / 10
+    }
+
+        /* Now the transformations. */
+
+    point1 = transformThisPoint(point1, frame.container)
+    point2 = transformThisPoint(point2, frame.container)
+    point3 = transformThisPoint(point3, frame.container)
+    point4 = transformThisPoint(point4, frame.container)
+
+    point1 = viewPort.fitIntoVisibleArea(point1)
+    point2 = viewPort.fitIntoVisibleArea(point2)
+    point3 = viewPort.fitIntoVisibleArea(point3)
+    point4 = viewPort.fitIntoVisibleArea(point4)
+
+    if (point3.y - point2.y < MIN_HEIGHT) {
+      point3.y = point2.y + MIN_HEIGHT
+      point4.y = point2.y + MIN_HEIGHT
+    }
+
+    /* Lets start the drawing. */
+/*
+    browserCanvasContext.beginPath()
+    browserCanvasContext.moveTo(point1.x, point1.y - TOP_MARGIN)
+    browserCanvasContext.lineTo(point2.x, point2.y - TOP_MARGIN)
+    browserCanvasContext.lineTo(point3.x, point3.y - TOP_MARGIN)
+    browserCanvasContext.lineTo(point4.x, point4.y - TOP_MARGIN)
+    browserCanvasContext.lineTo(point1.x, point1.y - TOP_MARGIN)
+    browserCanvasContext.closePath()
+
+    browserCanvasContext.strokeStyle = 'rgba(150, 150, 150, 1)'
+    browserCanvasContext.lineWidth = 1
+    browserCanvasContext.stroke()
+
+    browserCanvasContext.closePath()
+*/
+    thisObject.container.frame.position.x = point1.x
+    thisObject.container.frame.position.y = point1.y
+
+    thisObject.container.frame.width = point2.x - point1.x
+    thisObject.container.frame.height = point3.y - point2.y
   }
 }
diff --git a/TimeMachine.js b/TimeMachine.js
index edbd0e756..d270ac491 100644
--- a/TimeMachine.js
+++ b/TimeMachine.js
@@ -83,7 +83,6 @@ function newTimeMachine () {
     let timelineChart = newTimelineChart()
 
     timelineChart.container.connectToParent(thisObject.container, true, true)
-
     timelineChart.container.frame.height = thisObject.container.frame.height
 
     timelineChart.container.frame.position.x = thisObject.container.frame.width / 2 - timelineChart.container.frame.width / 2
@@ -108,6 +107,10 @@ function newTimeMachine () {
 
       timeScale = newTimeScale()
 
+      timeScale.container.connectToParent(thisObject.container, false, false)
+      /*
+      timeScale.container.frame.height = thisObject.container.frame.height / 10
+*/
       timeScale.container.eventHandler.listenToEvent('Lenght Percentage Changed', function (event) {
         thisObject.container.frame.width = TIME_MACHINE_WIDTH * event.lenghtPercentage / 100
         thisObject.container.eventHandler.raiseEvent('Dimmensions Changed', event)
@@ -195,17 +198,17 @@ function newTimeMachine () {
   }
 
   function draw () {
-    // this.container.frame.draw(false, false)
+    if (thisObject.container.frame.isInViewPort()) {
+      for (let i = 0; i < this.charts.length; i++) {
+        let chart = this.charts[i]
+        chart.draw()
+      }
 
-    for (let i = 0; i < this.charts.length; i++) {
-      let chart = this.charts[i]
-      chart.draw()
+      if (timeScale !== undefined) { timeScale.draw() }
+      if (rigthScale !== undefined) { rigthScale.draw() }
+
+      // thisObject.container.frame.draw(false, true, false)
     }
-
-    if (timeScale !== undefined) { timeScale.draw() }
-    if (rigthScale !== undefined) { rigthScale.draw() }
-
-    // thisObject.container.frame.draw(false, true, false)
   }
 
   function getContainer (point, purpose) {
diff --git a/ViewPort.js b/ViewPort.js
index 0497ddbaf..2e0f5dcfa 100644
--- a/ViewPort.js
+++ b/ViewPort.js
@@ -356,7 +356,7 @@ function newViewPort () {
 
     browserCanvasContext.beginPath()
 
-    let CROSS_SIZE = 5
+    let CROSS_SIZE = 4
 
     for (var i = startingX; i < thisObject.visibleArea.bottomRight.x + RIGHT_MARGIN; i = i + squareWidth) {
       for (var j = startingY; j < thisObject.visibleArea.bottomRight.y + BOTTOM_MARGIN; j = j + squareWidth) {