diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analiytics-graphs/public/css/graph.css b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analiytics-graphs/public/css/graph.css
index 20379121..48defd85 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analiytics-graphs/public/css/graph.css
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analiytics-graphs/public/css/graph.css
@@ -25,7 +25,7 @@
 	opacity: 0.5;
 	white-space: nowrap;
 	margin-left: 3px;
-	bottom: -17px;
+	bottom: -20px;
 }
 
 /* annotations */
@@ -187,6 +187,11 @@
 }
 
 .custom_slider {
-	top: 20px;
+    left: 40px;
+}
+
+.custom_x_axis {
+	position: relative;
 	left: 40px;
+	height: 30px;
 }
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/public/js/graph_util.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/public/js/graph_util.js
index 038a8ad5..19a5c833 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/public/js/graph_util.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/public/js/graph_util.js
@@ -142,6 +142,8 @@ $('body').on('click', '.btn-group button', function (e) {
 });
 
 function getDateTime(from, to) {
+    fromDate = from;
+    toDate = to;
     startDate = new Date(from);
     endDate = new Date(to);
     DateRange = convertDate(startDate) + " " + configObject.separator + " " + convertDate(endDate);
@@ -292,7 +294,7 @@ function drawLineGraph(graphId, chartDataRaw) {
         + '" class="custom_y_axis"></div><div class="legend_container" id="legend_container'
         + graphId + '"><div id="smoother' + graphId + '" title="Smoothing"></div><div class="legend" id="legend'
         + graphId + '"></div></div><div id="' + chartDiv
-        + '" class="custom_rickshaw_graph"></div><div id="' + sliderDiv
+        + '" class="custom_rickshaw_graph"></div><div class="custom_x_axis"></div><div id="' + sliderDiv
         + '" class="custom_slider"></div>');
 
     var graphConfig = {
@@ -379,7 +381,7 @@ function drawBarGraph(graphId, chartDataRaw) {
         + '" class="custom_y_axis"></div><div class="legend_container" id="legend_container'
         + graphId + '"><div id="smoother' + graphId + '" title="Smoothing"></div><div class="legend" id="legend'
         + graphId + '"></div></div><div id="' + chartDiv
-        + '" class="custom_rickshaw_graph"></div><div id="' + sliderDiv
+        + '" class="custom_rickshaw_graph"></div><div class="custom_x_axis"></div><div id="' + sliderDiv
         + '" class="custom_slider"></div>');
 
     var graphConfig = {