diff --git a/config/app.conf b/config/app.conf
index 3799013f..90f68811 100644
--- a/config/app.conf
+++ b/config/app.conf
@@ -1,7 +1,8 @@
 FileProcess=/Users/frezadev/Documents/watch
-host=52.77.236.193:27123
-database=wfdemo-oem
-dbrealtime=ecostrorealtime
+host=localhost:27123
+database=ecwfdemo
+dbrealtime=ecwfrealtime
 username=
 password=
-hfdfolder=/Volumes/Development/ostrorealtime
\ No newline at end of file
+hfdfolder=/mnt/data/ostrorealtime/data
+ReadTimeLoc=Asia/Kolkata
diff --git a/config/configurations.json b/config/configurations.json
index fc8f57ef..91370826 100644
--- a/config/configurations.json
+++ b/config/configurations.json
@@ -1,40 +1,38 @@
-[
-  {
-    "_id": "db_acl",
-    "data": {
-      "db": "wfdemo-oem",
-      "driver": "mongo",
-      "host": "52.77.236.193:27123",
-      "pass": "",
-      "setting": {
-        "timeout": 3000
-      },
-      "user": ""
-    }
-  },
-  {
-    "_id": "db_ostro",
-    "data": {
-      "db": "wfdemo-oem",
-      "driver": "mongo",
-      "host": "52.77.236.193:27123",
-      "pass": "",
-      "setting": {
-        "timeout": 3000
-      },
-      "user": ""
-    }
-  },
-  {
-    "_id": "port",
-    "data": 9002
-  },
-  {
-    "_id": "default_username",
-    "data": "eaciit"
-  },
-  {
-    "_id": "default_password",
-    "data": "Password.1"
-  }
-]
\ No newline at end of file
+[{
+		"_id": "db_acl",
+		"data": {
+			"db": "wfdemo-oem",
+			"driver": "mongo",
+			"host": "localhost:27123",
+			"pass": "",
+			"setting": {
+				"timeout": 3000
+			},
+			"user": ""
+		}
+	},
+	{
+		"_id": "db_ostro",
+		"data": {
+			"db": "wfdemo-oem",
+			"driver": "mongo",
+			"host": "localhost:27123",
+			"pass": "",
+			"setting": {
+				"timeout": 3000
+			},
+			"user": ""
+		}
+	},
+	{
+		"_id": "port",
+		"data": 8003
+	},
+	{
+		"_id": "default_username",
+		"data": "eaciit"
+	},
+	{
+		"_id": "default_password",
+		"data": "Password.1"
+	}]
diff --git a/update-build.sh b/update-build.sh
index 12f0c1f3..7c30712b 100644
--- a/update-build.sh
+++ b/update-build.sh
@@ -1,15 +1,13 @@
-#### for wfdemo-git-prod uncomment below part
-
-sudo pkill wfdemo-git-dev
+sudo pkill wfdemo-git-oem
 
 git reset --hard
 
-rm wfdemo-git-dev
+rm wfdemo-git-oem
 rm nohup.out
 
 git pull
 
-$GOPATH/bin/gorep -path="." -from="eaciit/wfdemo-git" -to="eaciit/wfdemo-git-dev"
+$GOPATH/bin/gorep -path="." -from="eaciit/wfdemo-git" -to="eaciit/wfdemo-git-oem"
 
-go build -o wfdemo-git-dev
-nohup ./wfdemo-git-dev &
+go build -o wfdemo-git-oem
+nohup ./wfdemo-git-oem &
diff --git a/web/assets/core/css/layout2.css b/web/assets/core/css/layout2.css
index 6a502b33..4cc84e39 100644
--- a/web/assets/core/css/layout2.css
+++ b/web/assets/core/css/layout2.css
@@ -1,3 +1,56 @@
+.content-wrapper, .right-side {
+    min-height: 100%;
+    background-color: #ffffff;
+    z-index: 800;
+}
+.filter-section{
+    margin-bottom: 5px !important;
+    border-bottom: 1.5px solid #f4f4f4;
+}
+
+.navbar-static-top {
+    border-bottom: 1px solid#eee!important;
+}
+.nav {
+    padding-left: 0;
+    margin-bottom: -8px;
+    list-style: none;
+}
+.border-right-grey{
+    border-right: 2px solid #eee;
+}
+.border-bottom-grey{
+    border-bottom:2px solid #eee;
+    margin-bottom: 0px!important;
+}
+.border-top-grey {
+    border-top: 2px solid #eee;
+    margin-bottom: 0px!important;
+    margin-left: -5px!important;
+    margin-top: 3.5px!important;
+}
+.dashboard-tab{
+    border-right: 1px solid #eee;
+}
+.panel{
+    margin-bottom: 0px;
+}
+.custom-div{
+    margin-top: 5px;
+    margin-left: -1.5px;
+}
+.windiness-div{
+    margin-left: -5px;
+    margin-top: 3.5px;
+    margin-bottom: -5px!important;
+}
+.panel-heading {
+    font-size: 15px;
+    padding-top: 5px;
+}
+.description-block.margin-bottom {
+    margin-bottom: 18.85px;
+}
 .dropdown-menu>li>a>.fa,
 .dropdown-menu>li>a>.glyphicon,
 .dropdown-menu>li>a>.ion {
@@ -557,43 +610,40 @@ form.k-filter-menu.k-popup.k-group.k-reset.k-state-border-down {
 }
 
 .dashboard-date-info {
-    background: #ea5b19;
     margin-top: -15px;
     padding: 5px 10px;
-    color: #fff;
+    color: #ea5b19;
     font-size: 12px;
     border-radius: 3px;
 }
 
 .content-header>.breadcrumb {
-    margin-top: -5px;
+    margin-top: -10px;
 }
 
 .nav-pills {
-    /*right: 300px;*/
-    /*min-width: 1170px;*/
     z-index: 1;
-    margin-bottom: 10px;
 }
 
 .nav-pills li {
-    margin-right: 0px;
+    
     margin-bottom: 2px;
 }
 
 .nav-pills li a {
-    border: 1px solid #f0f3f4;
-    background-color: rgba(51, 122, 183, 0.1);
-    /* margin: 3px; */
+    /*border: 1px solid #f0f3f4;*/
+    /*background-color: rgba(51, 122, 183, 0.1);*/
+     /*margin: 3px; */
     height: 30px;
+    margin-right: 2px;
     vertical-align: middle;
-    border-radius: 5px;
+    /*border-radius: 5px;*/
     padding-top: 5px;
 }
 
-.nav-pills li a:hover {
+/*.nav-pills li a:hover {
     background-color: rgba(51, 122, 183, 0.4);
-}
+}*/
 
 .nav-pills>li.active>a {
     font-weight: 400;
@@ -609,6 +659,16 @@ form.k-filter-menu.k-popup.k-group.k-reset.k-state-border-down {
     color: #337ab7;
 }
 
+.nav-pills>li.active>a, .nav-pills>li.active>a:focus, .nav-pills>li.active>a:hover {
+    color: #ea5b19;
+    background-color: #ffffff;
+}
+
+.nav-pills>li.active>a, .nav-pills>li.active>a:focus, .nav-pills>li.active>a:hover {
+     border-top-color: #fff; 
+}
+
+
 .no-padding-right {
     padding-right: 0px;
 }
@@ -685,11 +745,10 @@ form.k-filter-menu.k-popup.k-group.k-reset.k-state-border-down {
 
 .col-summary {
     max-height: 446.5px;
-    padding: 5px;
+    padding: 0px;
     margin: 5px;
     margin-top: 0px;
-    border-radius: 5px;
-    margin-left: -5px;
+    margin-left: -10px;
 }
 
 .label-filter {
@@ -728,7 +787,7 @@ label.control-label {
 }
 
 .nav-replace-title {
-    margin-top: -10px;
+    margin-top: -15px;
 }
 
 .ez.panel {
@@ -863,11 +922,11 @@ label {
     margin-top: 0px;
     margin-right: -5px;
     display: inline-block;
-    background-color: #ecf0f5 !important;
+    background-color: #ffffff !important;
 }
 
 .bread-info {
-    margin-top: 11px;
+    margin-top: 5px;
     margin-bottom: -20px;
     margin-right: 5px;
 }
diff --git a/web/assets/core/css/page-dashboard.css b/web/assets/core/css/page-dashboard.css
index 16be507a..b3a92b52 100644
--- a/web/assets/core/css/page-dashboard.css
+++ b/web/assets/core/css/page-dashboard.css
@@ -175,10 +175,6 @@
 	    margin-left: -1.5px;
 	    margin-right: 3.5px;
 	}
-	.windiness-div{
-	    margin-left: -3px;
-	    margin-right: -5px;
-	}
 	.prodCur-div{
 		margin-left: -6px;
 		padding-right: 4px;
diff --git a/web/assets/core/css/page-filter-analytic.css b/web/assets/core/css/page-filter-analytic.css
index 55033c86..7c10e06d 100644
--- a/web/assets/core/css/page-filter-analytic.css
+++ b/web/assets/core/css/page-filter-analytic.css
@@ -6,7 +6,7 @@
     padding-right: 0px;
 }
 .filter-content{
-    margin-bottom: 10px;
+    margin-bottom: 15px;
 }
 .k-datepicker, .k-timepicker, .k-datetimepicker, .k-colorpicker, .k-numerictextbox, .k-dropdown, .k-selectbox, .k-toolbar .k-split-button{
     white-space:inherit;
diff --git a/web/assets/core/css/page-monitoring/monitoring.css b/web/assets/core/css/page-monitoring/monitoring.css
index 103dd7e0..b9abdb82 100644
--- a/web/assets/core/css/page-monitoring/monitoring.css
+++ b/web/assets/core/css/page-monitoring/monitoring.css
@@ -38,6 +38,9 @@
 
     animation-name: flash-animation;
     animation-duration: 1.5s;
+}
+.mt-15{
+  margin-top: -15px;
 }   
 .redvalue {
     color: red;
@@ -539,6 +542,7 @@ h4.content-heading {
 .border-left-grey{
     border-left: 2px solid #eee;
 }
+
  .border-right-grey{
     border-right:2px solid #eee;
 }
@@ -585,9 +589,9 @@ h4.content-heading {
   margin-left: -20px;
 }
 
-.nav-replace-title{
+/*.nav-replace-title{
   padding-left: 5px;
-}
+}*/
 
 #dateInfo{
     font-weight: bold;
@@ -599,6 +603,15 @@ h4.content-heading {
   padding-top: 15px;
 }
 
+.part:after {
+  content: '';
+  width: 0;
+  height: 100%;
+  position: absolute;
+  border: 2px solid #eee;
+  top: 0;
+}
+
 /*#turbine_weather{
     font-size: 20px;
 }
diff --git a/web/assets/core/js/page-dashboard-summary.js b/web/assets/core/js/page-dashboard-summary.js
index daf216ba..ad159936 100644
--- a/web/assets/core/js/page-dashboard-summary.js
+++ b/web/assets/core/js/page-dashboard-summary.js
@@ -218,7 +218,7 @@ sum.PLF = function (dataSource) {
             majorGridLines: {
                 visible: true,
                 color: "#eee",
-                width: 0.8,
+                width: 0,
             },
         },
         categoryAxis: {
@@ -295,7 +295,7 @@ sum.LostEnergy = function (dataSource) {
             majorGridLines: {
                 visible: true,
                 color: "#eee",
-                width: 0.8,
+                width: 0,
             }
         },
         categoryAxis: {
@@ -385,7 +385,7 @@ sum.Windiness = function (dataSource) {
             majorGridLines: {
                 visible: true,
                 color: "#eee",
-                width: 0.8,
+                width: 0,
             }
         },
         categoryAxis: {
@@ -553,7 +553,7 @@ sum.ProdMonth = function (dataSource) {
             majorGridLines: {
                 visible: true,
                 color: "#eee",
-                width: 0.8,
+                width: 0,
             },
             labels: {
                 step: 2,
@@ -647,7 +647,7 @@ sum.AvailabilityChart = function (dataSource) {
             majorGridLines: {
                 visible: true,
                 color: "#eee",
-                width: 0.8,
+                width: 0,
             },
         },
         categoryAxis: {
@@ -749,7 +749,7 @@ sum.ProdCurLast = function (dataSource) {
             majorGridLines: {
                 visible: true,
                 color: "#eee",
-                width: 0.8,
+                width: 0,
             },
             name: "production",
         }, {
@@ -759,7 +759,7 @@ sum.ProdCurLast = function (dataSource) {
             majorGridLines: {
                 visible: true,
                 color: "#eee",
-                width: 0.8,
+                width: 0,
             },
             labels: {
                 format: "{0}%",
@@ -956,7 +956,7 @@ sum.ProductionChart = function (dataSource) {
             majorGridLines: {
                 visible: true,
                 color: "#eee",
-                width: 0.8,
+                width: 0,
             }
             //  majorUnit: 3,
             //     line: {
@@ -1048,7 +1048,7 @@ sum.CumProduction = function (dataSource) {
             majorGridLines: {
                 visible: true,
                 color: "#eee",
-                width: 0.8,
+                width: 0,
             },
             labels: {
                 step: 2,
@@ -1157,7 +1157,7 @@ sum.DetailProd = function (e) {
                 majorGridLines: {
                     visible: true,
                     color: "#eee",
-                    width: 0.8,
+                    width: 0,
                 },
             },
             categoryAxis: {
@@ -1269,7 +1269,7 @@ sum.DetailProdByProject = function (e, month, data) {
             majorGridLines: {
                 visible: true,
                 color: "#eee",
-                width: 0.8,
+                width: 0,
             },
         },
         categoryAxis: {
diff --git a/web/view/_filter-analytic.html b/web/view/_filter-analytic.html
index 248e65d8..64e7e5d1 100644
--- a/web/view/_filter-analytic.html
+++ b/web/view/_filter-analytic.html
@@ -8,36 +8,36 @@
 	}
 </style>
 <div class="row" id="filter-analytic">
-	<div class="col-md-12 col-sm-12 ez panel-content">
-		<div class="nav nav-pills nav-replace-title" style="padding-left: 5px;">
-			<div class="col-md-12 col-sm-12 filter-content">
-				<label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
-				<select class="col-md-1 col-sm-1 project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: fa.projectList, dataValueField: 'value', dataTextField: 'text', optionLabel: 'All Projects', suggest: true }"
-					style="width:145px">
-                </select>&nbsp;
-				<div class="small-screen">&nbsp;</div>
-				<label class="col-md-1 col-sm-1 control-label label-filter">Turbine</label>
-				<select class="col-md-1 col-sm-1 turbine-list" id="turbineList" name="table" data-bind="kendoMultiSelect: { data: fa.turbineList, dataValueField: 'value', dataTextField: 'text', change: function() {fa.checkTurbine()}, suggest: true }"
-					style="width:120px">
-                </select>&nbsp;
-				<div class="new-line">&nbsp;</div>
-				<label class="control-label col-md-1 col-sm-1 label-filter">Period</label>&nbsp;
-				<select class="col-md-1 col-sm-1 period-list" id="periodList" name="table" data-bind="kendoDropDownList: { data: fa.periodList, dataValueField: 'value', dataTextField: 'text', suggest: true, change: function() {fa.showHidePeriod()} }"
-					style="width:110px">
-                </select>
-				<div class="small-screen">&nbsp;</div>
-				<span class="show_hide custom-period">
-                    <input class="col-md-1 col-sm-1 filter-date-start" type="text" id="dateStart" data-bind="kendoDatePicker:{value:new Date(),format:'dd-MMM-yyyy', min: new Date(2013, 01, 01),max:new Date(),change: function(){fa.DateChange()}}" style="width:105px" />
-                    <label class="control-label col-md-1 col-sm-1 label-filter" style="width:40px;">&nbsp;&nbsp;to</label>
-                    <div class="period-nwline">&nbsp;</div>
-                    <input class="col-md-1 col-sm-1 filter-date-end" type="text" id="dateEnd" data-bind="kendoDatePicker:{value:new Date(),format:'dd-MMM-yyyy',min: new Date(2013, 01, 01),max:new Date(),change: function(){fa.DateChange()}}" style="width:105px" />&nbsp;
-                    &nbsp;
-                </span>
-				<div class="search-btn-line">&nbsp;</div>
-				<button type="button" id="btnRefresh" class="btn btn-sm btn-primary btn-filter-refresh"><i class="fa fa-refresh"></i>&nbsp;Refresh</button>
-				<span class="incomplete-icon" data-bind="visible: fa.infoPeriodIcon() == true"><i class="fa fa-bell tooltipster tooltipstered faa-tada animated" title="Incomplete period data range" aria-hidden="true"></i></span>
-			</div>
-		</div>
+	<div class="col-md-12 filter-section">
+	    <div class="nav nav-pills nav-replace-title" role="tablist">
+	       <div class="col-md-12 col-sm-12 filter-content">
+					<label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
+					<select class="col-md-1 col-sm-1 project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: fa.projectList, dataValueField: 'value', dataTextField: 'text', optionLabel: 'All Projects', suggest: true }"
+						style="width:145px">
+	                </select>&nbsp;
+					<div class="small-screen">&nbsp;</div>
+					<label class="col-md-1 col-sm-1 control-label label-filter">Turbine</label>
+					<select class="col-md-1 col-sm-1 turbine-list" id="turbineList" name="table" data-bind="kendoMultiSelect: { data: fa.turbineList, dataValueField: 'value', dataTextField: 'text', change: function() {fa.checkTurbine()}, suggest: true }"
+						style="width:120px">
+	                </select>&nbsp;
+					<div class="new-line">&nbsp;</div>
+					<label class="control-label col-md-1 col-sm-1 label-filter">Period</label>&nbsp;
+					<select class="col-md-1 col-sm-1 period-list" id="periodList" name="table" data-bind="kendoDropDownList: { data: fa.periodList, dataValueField: 'value', dataTextField: 'text', suggest: true, change: function() {fa.showHidePeriod()} }"
+						style="width:110px">
+	                </select>
+					<div class="small-screen">&nbsp;</div>
+					<span class="show_hide custom-period">
+	                    <input class="col-md-1 col-sm-1 filter-date-start" type="text" id="dateStart" data-bind="kendoDatePicker:{value:new Date(),format:'dd-MMM-yyyy', min: new Date(2013, 01, 01),max:new Date(),change: function(){fa.DateChange()}}" style="width:105px" />
+	                    <label class="control-label col-md-1 col-sm-1 label-filter" style="width:40px;">&nbsp;&nbsp;to</label>
+	                    <div class="period-nwline">&nbsp;</div>
+	                    <input class="col-md-1 col-sm-1 filter-date-end" type="text" id="dateEnd" data-bind="kendoDatePicker:{value:new Date(),format:'dd-MMM-yyyy',min: new Date(2013, 01, 01),max:new Date(),change: function(){fa.DateChange()}}" style="width:105px" />&nbsp;
+	                    &nbsp;
+	                </span>
+					<div class="search-btn-line">&nbsp;</div>
+					<button type="button" id="btnRefresh" class="btn btn-sm btn-primary btn-filter-refresh"><i class="fa fa-refresh"></i>&nbsp;Refresh</button>
+					<span class="incomplete-icon" data-bind="visible: fa.infoPeriodIcon() == true"><i class="fa fa-bell tooltipster tooltipstered faa-tada animated" title="Incomplete period data range" aria-hidden="true"></i></span>
+				</div>
+	    </div>
 	</div>
 </div>
 <!-- <div class="col-md-12 col-sm-12 ez panel-content">
diff --git a/web/view/page-analytic-power-curve/page-filter-scatter.html b/web/view/page-analytic-power-curve/page-filter-scatter.html
index e890e85f..55f673c6 100644
--- a/web/view/page-analytic-power-curve/page-filter-scatter.html
+++ b/web/view/page-analytic-power-curve/page-filter-scatter.html
@@ -7,9 +7,9 @@
 	}
 </style>
 <div class="row" id="filter-analytic">
-	<div class="col-md-12 col-sm-12 ez panel-content">
-		<div class="nav nav-pills nav-replace-title" style="padding-left: 5px;">
-			<div class="col-md-12 col-sm-12 filter-content">
+	<div class="col-md-12 filter-section">
+	    <div class="nav nav-pills nav-replace-title" role="tablist">
+	       <div class="col-md-12 col-sm-12 filter-content">
 				<label class="label-filters">Project</label>
 				<select class="project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: fa.projectList, dataValueField: 'value', dataTextField: 'text', optionLabel: 'All Projects', suggest: true }">
                 </select>&nbsp;
@@ -27,6 +27,6 @@
 				<button type="button" id="btnRefresh" class="btn btn-sm btn-primary btn-filter-refresh"><i class="fa fa-refresh"></i>&nbsp;Refresh</button>
 				<span class="incomplete-icon" data-bind="visible: fa.infoPeriodIcon() == true"><i class="fa fa-bell tooltipster tooltipstered faa-tada animated" title="Incomplete period data range" aria-hidden="true"></i></span>
 			</div>
-		</div>
+	    </div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/web/view/page-dashboard-summary.html b/web/view/page-dashboard-summary.html
index ae8e0985..9fe78a29 100644
--- a/web/view/page-dashboard-summary.html
+++ b/web/view/page-dashboard-summary.html
@@ -67,22 +67,15 @@
     <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# m/s</span></div>
   # } #
 </script>
-<script id="templateWindiness" type="text/x-kendo-template">
-  <div style="text-align:center"><b>#: category #</b></div>
-  # for (var i = 0; i < points.length; i++) { #
-    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# %</span></div>
-  # } #
-</script>
 <script id="templateDistribution" type="text/x-kendo-template">
   <div style="text-align:center"><b>#: category #</b></div>
   # for (var i = 0; i < points.length; i++) { #
     <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'p1') #</span></div>
   # } #
 </script>
-
 <div data-bind="visible:lgd.isSummary">
 	<div class="col-md-8 col-sm-8">
-		<div class="col-md-6 col-sm-6 hardcore landing">
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
 			<div class="panel ez no-padding hardcore">
 				<div class="panel-heading">
 					Production (kWh) - Last 24 Hours
@@ -97,13 +90,13 @@
                       </div>
                   </span>
 				</div>
-				<div class="panel-body" style="height: 185px;">
+				<div class="panel-body">
 					<div id="chartProductionCustomTooltip"></div>
 					<div id="chartProduction"></div>
 				</div>
 			</div>
 		</div>
-		<div class="col-md-6 col-sm-6 hardcore landing">
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
 			<div class="panel ez no-padding hardcore">
 				<div class="panel-heading">
 					Availability (%) - Last 12 Months
@@ -119,12 +112,12 @@
                       </div>
                   </span>
 				</div>
-				<div class="panel-body" style="height: 185px;">
+				<div class="panel-body">
 					<div id="chartAbility"></div>
 				</div>
 			</div>
 		</div>
-		<div class="col-md-6 col-sm-6 hardcore landing">
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
 			<div class="panel ez no-padding hardcore">
 				<div class="panel-heading">
 					Cumulative Production (GWh) - Month to Date
@@ -145,7 +138,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="col-md-6 col-sm-6 hardcore landing">
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
 			<div class="panel ez no-padding hardcore">
 				<div class="panel-heading">
 				Lost Energy (GWh) - Last 12 Months
@@ -202,13 +195,13 @@ <h4 class="description-header second-city">0%</h4>
 		</div>
 		<div class="col-md-9 col-sm-8 no-padding">
 			<div class="pad">
-				<div id="india-map" style="height: 446.5px;"></div>
+				<div id="india-map" style="height: 425px;"></div>
 			</div>
 		</div>
 	</div>
 	<div class="col-md-12 col-sm-12 no-padding">
 		<div class="col-md-12 col-sm-12 ez panel-content">
-			<div class="col-md-4 col-sm-4 hardcore landing">
+			<div class="col-md-4 col-sm-4 hardcore landing border-right-grey border-bottom-grey custom-div">
 				<div class="panel ez no-padding hardcore prod-div">
 					<div class="panel-heading">
 					Production (GWh) - Last 12 Months
@@ -229,7 +222,7 @@ <h5 class="label-drilldown"><small><center>click on each series to view the dril
 					</div>
 				</div>
 			</div>
-			<div class="col-md-4 col-sm-4 hardcore landing">
+			<div class="col-md-4 col-sm-4 hardcore landing border-right-grey custom-div">
 				<div class="panel ez no-padding hardcore plf-div">
 					<div class="panel-heading">
 					PLF (%) Comparison for all Projects - Last 12 Months
@@ -250,7 +243,7 @@ <h5 class="label-drilldown"><small><center>click on each series to view the dril
 				</div>
 			</div>
 			<div class="col-md-4 col-sm-4 hardcore landing" id="div-windiness">
-				<div class="panel ez no-padding hardcore windiness-div">
+				<div class="panel  no-padding hardcore windiness-div border-top-grey custom-div">
 					<div class="panel-heading">
 					Windiness (m/s) - Last 12 Months
 					<span class="tools pull-right">
@@ -293,7 +286,7 @@ <h5 class="label-drilldown"><small><center>click on each series to view the dril
 			</div>
 		</div>
 		<div class="col-md-12 col-sm-12 ez panel-content">
-			<div class="col-md-4 col-sm-4 hardcore landing">
+			<div class="col-md-4 col-sm-4 hardcore landing border-right-grey custom-div">
 				<div class="panel ez no-padding hardcore prod-div">
 					<div class="panel-heading">
 					Production (GWh) - Current Year & Last Year
@@ -314,7 +307,7 @@ <h5 class="label-drilldown"><small><center>click on each series to view the dril
 				</div>
 			</div>
 			<div class="col-md-8 col-sm-8 hardcore landing">
-				<div class="panel ez no-padding hardcore summary-div">
+				<div class="panel no-padding hardcore summary-div custom-div border-top-grey">
 					<div class="panel-heading">
 					Summary Data for Last 12 Months
 					</div>
@@ -326,7 +319,6 @@ <h5 class="label-drilldown"><small><center>click on each series to view the dril
 		</div>
 	</div>
 </div>
-
 <div data-bind="visible:sum.isDetailProd">
 	<div class="col-md-12 col-sm-12 ez panel-content">
 		<div class="col-md-12 col-sm-12">
diff --git a/web/view/page-dashboard-summary_BACKUP_55592.html b/web/view/page-dashboard-summary_BACKUP_55592.html
new file mode 100644
index 00000000..1687752b
--- /dev/null
+++ b/web/view/page-dashboard-summary_BACKUP_55592.html
@@ -0,0 +1,387 @@
+<script src="{{BaseUrl}}res/core/js/page-dashboard-summary.js?ANTI_CACHE={{.AntiCache}}"></script>
+
+<script id="templateProd" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: kendo.toString(kendo.parseDate(vm.dateAsOf()), 'dd MMM yyyy') # #: category #:00</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n2') # kWh</span></div>
+  # } #
+</script>
+
+<script id="templateCum" type="text/x-kendo-template">
+  <div><b>#: kendo.toString(kendo.parseDate(category), 'dd MMM yyyy') #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1') # GWh</span></div>
+  # } #
+</script>
+<script id="templateAvail" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1') # %</span></div>
+  # } #
+</script>
+<script id="templateAvailPercentage" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'p1') #</span></div>
+  # } #
+</script>
+<script id="templateProdMonth" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(kendo.format('{0:n2}',points[i].value), 2)# GWh</span></div>
+  # } #
+</script>
+<!-- <script id="templateDTLEbyType" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { 
+  		if(i==0) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# MWh</span></div>
+  # 	} else if(i==1) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# hours</span></div>
+  # 	} else if(i==2) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: points[i].value # times</span></div>
+  # 	}
+  	} #
+</script> -->
+<script id="templateDTLEbyType" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { 
+        if(points[i].series.name == 'Frequency') { #
+            <tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n0')#</td></tr></table>
+  #     } else if (points[i].series.name == 'Duration') { #
+            <tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n1')# Hours</td></tr>
+  #     } else { #
+            <table><tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n1')# MWh</td></tr>
+  #     }
+    } #
+</script>
+<script id="templateDowntimeLostEnergy" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# MWh</span></div>
+  # } #
+</script>
+<script id="templateWindiness" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# m/s</span></div>
+  # } #
+</script>
+<<<<<<< HEAD
+=======
+<script id="templateWindiness" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# %</span></div>
+  # } #
+</script>
+<script id="templateDistribution" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'p1') #</span></div>
+  # } #
+</script>
+
+>>>>>>> master
+<div data-bind="visible:lgd.isSummary">
+	<div class="col-md-8 col-sm-8">
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Production (kWh) - Last 24 Hours
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs prodToTable" onclick="$('#chartProduction').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProductionChart(sum.dataSource().Productions)">
+                              <input type="radio" name="convert" id="tochart" value="tochart" autofocus="true"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body">
+					<div id="chartProductionCustomTooltip"></div>
+					<div id="chartProduction"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Availability (%) - Last 12 Months
+        		<span class="tools pull-right">
+        			  <i class="fa fa-question-circle tooltipster tooltipstered" aria-hidden="true" title="Information"></i>
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartAbility').kendoChart2Grid('n1')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.AvailabilityChart(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body">
+					<div id="chartAbility"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Cumulative Production (GWh) - Month to Date
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartCumProduction').kendoChart2Grid('n1','dd-MMM-yyyy')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.CumProduction(sum.dataSource().CummulativeProductions)">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<!--<h5 class="label-drilldown"><small><center>click on each series to view the drilldown</center></small></h5>-->
+					<div id="chartCumProduction"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+				Lost Energy (GWh) - Last 12 Months
+				<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartLostEnergy').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.LostEnergy(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<!-- <div id="chartDTLostEnergyCustomTooltip"></div> -->
+					<div id="chartLostEnergy"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="col-sm-4 col-sm-4">
+		<div class="col-md-3 col-sm-4 no-padding">
+			<div class="pad box-pane-right bg-white col-summary">
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">No. of Sites</div>
+					<h4 class="description-header first-city" data-bind="text:sum.noOfProjects">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">No. of Turbines</div>
+					<h4 class="description-header first-city" data-bind="text:sum.noOfTurbines">0</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Total Max. Capacity</div>
+					<h4 class="description-header first-city" data-bind="text:sum.totalMaxCapacity">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">Currently Down</div>
+					<h4 class="description-header third-city" data-bind="text:sum.currentDown">0</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Down More Than 2 Days</div>
+					<h4 class="description-header third-city" data-bind="text:sum.twoDaysDown">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">Performance vs Budget</div>
+					<h4 class="description-header second-city">0%</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Achievement vs Annual Budget</div>
+					<h4 class="description-header second-city">0%</h4>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-9 col-sm-8 no-padding">
+			<div class="pad">
+				<div id="india-map" style="height: 425px;"></div>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 no-padding">
+		<div class="col-md-12 col-sm-12 ez panel-content">
+			<div class="col-md-4 col-sm-4 hardcore landing border-right-grey border-bottom-grey custom-div">
+				<div class="panel ez no-padding hardcore prod-div">
+					<div class="panel-heading">
+					Production (GWh) - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartProdMonth').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProdMonth(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<h5 class="label-drilldown"><small><center>click on each series to view the drilldown</center></small></h5>
+						<div id="chartProdMonth"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4 col-sm-4 hardcore landing border-right-grey custom-div">
+				<div class="panel ez no-padding hardcore plf-div">
+					<div class="panel-heading">
+					PLF (%) Comparison for all Projects - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartPLF').kendoChart2Grid('n0')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.PLF(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartPLF"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4 col-sm-4 hardcore landing" id="div-windiness">
+				<div class="panel  no-padding hardcore windiness-div border-top-grey custom-div">
+					<div class="panel-heading">
+					Windiness (m/s) - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartWindiness').kendoChart2Grid()">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.Windiness(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartWindinessCustomTooltip"></div>
+						<div id="chartWindiness"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4 col-sm-4 hardcore landing" id="div-winddistribution">
+				<div class="panel ez no-padding hardcore winddistribution-div">
+					<div class="panel-heading">
+					Wind Distribution - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartWindDistribution').kendoChart2Grid()">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.WindDistribution(sum.dataSourceWindDistribution())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartWindDistributionCustomTooltip"></div>
+						<div id="chartWindDistribution"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-12 col-sm-12 ez panel-content">
+			<div class="col-md-4 col-sm-4 hardcore landing border-right-grey custom-div">
+				<div class="panel ez no-padding hardcore prod-div">
+					<div class="panel-heading">
+					Production (GWh) - Current Year & Last Year
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartCurrLast').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProdCurLast(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartCurrLast"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-8 col-sm-8 hardcore landing">
+				<div class="panel no-padding hardcore summary-div custom-div border-top-grey">
+					<div class="panel-heading">
+					Summary Data for Last 12 Months
+					</div>
+					<div class="panel-body panel-summary gridSummaryData" style="height: 185px;">
+						<div id="gridSummaryData"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<div data-bind="visible:sum.isDetailProd">
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12">
+			<ul class="nav nav-pills nav-replace-title" role="tablist">
+				<li role="presentation" class="active">
+					<a role="tab" data-toggle="tab" class="btn-back" data-bind="click:sum.backToDashboard()"><i class="fa fa-reply" aria-hidden="true"></i> Back </a>
+				</li>
+			</ul>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 ez panel-content" id="divChartDetail">
+		<div class="col-md-12 col-sm-12 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">Detail Production<span data-bind="text:sum.detailProdMsTxt"></span> <span class="fa fa-angle-double-right"></span>&nbsp;<strong><span data-bind="text:sum.detailProdTxt"></span></strong></div>
+				<div class="panel-body">
+					<div class="col-md-8">
+						<div id="chartDetailProduction"></div>
+						<div class="clearfix">&nbsp;</div>
+					</div>
+					<div class="col-md-4">
+						<div id="gridDetailProduction"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div data-bind="visible:sum.isDetailProdByProject">
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12">
+			<ul class="nav nav-pills nav-replace-title" role="tablist">
+				<li role="presentation" class="active">
+					<a role="tab" data-toggle="tab" class="btn-back" data-bind="click:sum.toDetailProduction()"><i class="fa fa-reply" aria-hidden="true"></i> Back</a>
+				</li>
+			</ul>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading"><span data-bind="text:sum.detailProdProjectTxt"></span>&nbsp;<span class="fa fa-angle-double-right"></span>&nbsp;<strong><span data-bind="text:sum.detailProdDateTxt"></strong></div>
+				<div class="panel-body">
+					<div class="col-md-8">
+						<div id="chartDetailProdByProject"></div>
+						<div class="clearfix">&nbsp;</div>
+					</div>
+					<div class="col-md-4">
+						<div id="gridDetailProdByProject"></div>
+					</div>
+
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/web/view/page-dashboard-summary_BASE_55592.html b/web/view/page-dashboard-summary_BASE_55592.html
new file mode 100644
index 00000000..f409733c
--- /dev/null
+++ b/web/view/page-dashboard-summary_BASE_55592.html
@@ -0,0 +1,352 @@
+<script src="{{BaseUrl}}res/core/js/page-dashboard-summary.js?ANTI_CACHE={{.AntiCache}}"></script>
+
+<script id="templateProd" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: kendo.toString(kendo.parseDate(vm.dateAsOf()), 'dd MMM yyyy') # #: category #:00</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n2') # kWh</span></div>
+  # } #
+</script>
+
+<script id="templateCum" type="text/x-kendo-template">
+  <div><b>#: kendo.toString(kendo.parseDate(category), 'dd MMM yyyy') #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1') # GWh</span></div>
+  # } #
+</script>
+<script id="templateAvail" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1') # %</span></div>
+  # } #
+</script>
+<script id="templateAvailPercentage" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'p1') #</span></div>
+  # } #
+</script>
+<script id="templateProdMonth" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(kendo.format('{0:n2}',points[i].value), 2)# GWh</span></div>
+  # } #
+</script>
+<!-- <script id="templateDTLEbyType" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { 
+  		if(i==0) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# MWh</span></div>
+  # 	} else if(i==1) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# hours</span></div>
+  # 	} else if(i==2) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: points[i].value # times</span></div>
+  # 	}
+  	} #
+</script> -->
+<script id="templateDTLEbyType" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { 
+        if(points[i].series.name == 'Frequency') { #
+            <tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n0')#</td></tr></table>
+  #     } else if (points[i].series.name == 'Duration') { #
+            <tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n1')# Hours</td></tr>
+  #     } else { #
+            <table><tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n1')# MWh</td></tr>
+  #     }
+    } #
+</script>
+<script id="templateDowntimeLostEnergy" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# MWh</span></div>
+  # } #
+</script>
+<script id="templateWindiness" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# m/s</span></div>
+  # } #
+</script>
+
+<div data-bind="visible:lgd.isSummary">
+	<div class="col-md-8 col-sm-8">
+		<div class="col-md-6 col-sm-6 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Production (kWh) - Last 24 Hours
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs prodToTable" onclick="$('#chartProduction').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProductionChart(sum.dataSource().Productions)">
+                              <input type="radio" name="convert" id="tochart" value="tochart" autofocus="true"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<div id="chartProductionCustomTooltip"></div>
+					<div id="chartProduction"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Availability (%) - Last 12 Months
+        		<span class="tools pull-right">
+        			  <i class="fa fa-question-circle tooltipster tooltipstered" aria-hidden="true" title="Information"></i>
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartAbility').kendoChart2Grid('n1')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.AvailabilityChart(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<div id="chartAbility"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Cumulative Production (GWh) - Month to Date
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartCumProduction').kendoChart2Grid('n1','dd-MMM-yyyy')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.CumProduction(sum.dataSource().CummulativeProductions)">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<!--<h5 class="label-drilldown"><small><center>click on each series to view the drilldown</center></small></h5>-->
+					<div id="chartCumProduction"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+				Lost Energy (GWh) - Last 12 Months
+				<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartLostEnergy').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.LostEnergy(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<!-- <div id="chartDTLostEnergyCustomTooltip"></div> -->
+					<div id="chartLostEnergy"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="col-sm-4 col-sm-4">
+		<div class="col-md-3 col-sm-4 no-padding">
+			<div class="pad box-pane-right bg-white col-summary">
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">No. of Sites</div>
+					<h4 class="description-header first-city" data-bind="text:sum.noOfProjects">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">No. of Turbines</div>
+					<h4 class="description-header first-city" data-bind="text:sum.noOfTurbines">0</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Total Max. Capacity</div>
+					<h4 class="description-header first-city" data-bind="text:sum.totalMaxCapacity">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">Currently Down</div>
+					<h4 class="description-header third-city" data-bind="text:sum.currentDown">0</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Down More Than 2 Days</div>
+					<h4 class="description-header third-city" data-bind="text:sum.twoDaysDown">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">Performance vs Budget</div>
+					<h4 class="description-header second-city">0%</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Achievement vs Annual Budget</div>
+					<h4 class="description-header second-city">0%</h4>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-9 col-sm-8 no-padding">
+			<div class="pad">
+				<div id="india-map" style="height: 446.5px;"></div>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 no-padding">
+		<div class="col-md-12 col-sm-12 ez panel-content">
+			<div class="col-md-4 col-sm-4 hardcore landing">
+				<div class="panel ez no-padding hardcore prod-div">
+					<div class="panel-heading">
+					Production (GWh) - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartProdMonth').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProdMonth(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<h5 class="label-drilldown"><small><center>click on each series to view the drilldown</center></small></h5>
+						<div id="chartProdMonth"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4 col-sm-4 hardcore landing">
+				<div class="panel ez no-padding hardcore plf-div">
+					<div class="panel-heading">
+					PLF (%) Comparison for all Projects - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartPLF').kendoChart2Grid('n0')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.PLF(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartPLF"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4 col-sm-4 hardcore landing" id="div-windiness">
+				<div class="panel ez no-padding hardcore windiness-div">
+					<div class="panel-heading">
+					Windiness (m/s) - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartWindiness').kendoChart2Grid()">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.Windiness(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartWindinessCustomTooltip"></div>
+						<div id="chartWindiness"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-12 col-sm-12 ez panel-content">
+			<div class="col-md-4 col-sm-4 hardcore landing">
+				<div class="panel ez no-padding hardcore prod-div">
+					<div class="panel-heading">
+					Production (GWh) - Current Year & Last Year
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartCurrLast').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProdCurLast(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartCurrLast"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-8 col-sm-8 hardcore landing">
+				<div class="panel ez no-padding hardcore summary-div">
+					<div class="panel-heading">
+					Summary Data for Last 12 Months
+					</div>
+					<div class="panel-body panel-summary gridSummaryData" style="height: 185px;">
+						<div id="gridSummaryData"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div data-bind="visible:sum.isDetailProd">
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12">
+			<ul class="nav nav-pills nav-replace-title" role="tablist">
+				<li role="presentation" class="active">
+					<a role="tab" data-toggle="tab" class="btn-back" data-bind="click:sum.backToDashboard()"><i class="fa fa-reply" aria-hidden="true"></i> Back </a>
+				</li>
+			</ul>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 ez panel-content" id="divChartDetail">
+		<div class="col-md-12 col-sm-12 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">Detail Production<span data-bind="text:sum.detailProdMsTxt"></span> <span class="fa fa-angle-double-right"></span>&nbsp;<strong><span data-bind="text:sum.detailProdTxt"></span></strong></div>
+				<div class="panel-body">
+					<div class="col-md-8">
+						<div id="chartDetailProduction"></div>
+						<div class="clearfix">&nbsp;</div>
+					</div>
+					<div class="col-md-4">
+						<div id="gridDetailProduction"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div data-bind="visible:sum.isDetailProdByProject">
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12">
+			<ul class="nav nav-pills nav-replace-title" role="tablist">
+				<li role="presentation" class="active">
+					<a role="tab" data-toggle="tab" class="btn-back" data-bind="click:sum.toDetailProduction()"><i class="fa fa-reply" aria-hidden="true"></i> Back</a>
+				</li>
+			</ul>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading"><span data-bind="text:sum.detailProdProjectTxt"></span>&nbsp;<span class="fa fa-angle-double-right"></span>&nbsp;<strong><span data-bind="text:sum.detailProdDateTxt"></strong></div>
+				<div class="panel-body">
+					<div class="col-md-8">
+						<div id="chartDetailProdByProject"></div>
+						<div class="clearfix">&nbsp;</div>
+					</div>
+					<div class="col-md-4">
+						<div id="gridDetailProdByProject"></div>
+					</div>
+
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/web/view/page-dashboard-summary_LOCAL_55592.html b/web/view/page-dashboard-summary_LOCAL_55592.html
new file mode 100644
index 00000000..c89e07d9
--- /dev/null
+++ b/web/view/page-dashboard-summary_LOCAL_55592.html
@@ -0,0 +1,350 @@
+<script src="{{BaseUrl}}res/core/js/page-dashboard-summary.js?ANTI_CACHE={{.AntiCache}}"></script>
+
+<script id="templateProd" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: kendo.toString(kendo.parseDate(vm.dateAsOf()), 'dd MMM yyyy') # #: category #:00</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n2') # kWh</span></div>
+  # } #
+</script>
+
+<script id="templateCum" type="text/x-kendo-template">
+  <div><b>#: kendo.toString(kendo.parseDate(category), 'dd MMM yyyy') #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1') # GWh</span></div>
+  # } #
+</script>
+<script id="templateAvail" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1') # %</span></div>
+  # } #
+</script>
+<script id="templateAvailPercentage" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'p1') #</span></div>
+  # } #
+</script>
+<script id="templateProdMonth" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(kendo.format('{0:n2}',points[i].value), 2)# GWh</span></div>
+  # } #
+</script>
+<!-- <script id="templateDTLEbyType" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { 
+  		if(i==0) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# MWh</span></div>
+  # 	} else if(i==1) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# hours</span></div>
+  # 	} else if(i==2) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: points[i].value # times</span></div>
+  # 	}
+  	} #
+</script> -->
+<script id="templateDTLEbyType" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { 
+        if(points[i].series.name == 'Frequency') { #
+            <tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n0')#</td></tr></table>
+  #     } else if (points[i].series.name == 'Duration') { #
+            <tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n1')# Hours</td></tr>
+  #     } else { #
+            <table><tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n1')# MWh</td></tr>
+  #     }
+    } #
+</script>
+<script id="templateDowntimeLostEnergy" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# MWh</span></div>
+  # } #
+</script>
+<script id="templateWindiness" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# m/s</span></div>
+  # } #
+</script>
+<div data-bind="visible:lgd.isSummary">
+	<div class="col-md-8 col-sm-8">
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Production (kWh) - Last 24 Hours
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs prodToTable" onclick="$('#chartProduction').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProductionChart(sum.dataSource().Productions)">
+                              <input type="radio" name="convert" id="tochart" value="tochart" autofocus="true"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body">
+					<div id="chartProductionCustomTooltip"></div>
+					<div id="chartProduction"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Availability (%) - Last 12 Months
+        		<span class="tools pull-right">
+        			  <i class="fa fa-question-circle tooltipster tooltipstered" aria-hidden="true" title="Information"></i>
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartAbility').kendoChart2Grid('n1')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.AvailabilityChart(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body">
+					<div id="chartAbility"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Cumulative Production (GWh) - Month to Date
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartCumProduction').kendoChart2Grid('n1','dd-MMM-yyyy')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.CumProduction(sum.dataSource().CummulativeProductions)">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<!--<h5 class="label-drilldown"><small><center>click on each series to view the drilldown</center></small></h5>-->
+					<div id="chartCumProduction"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing border-right-grey border-bottom-grey">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+				Lost Energy (GWh) - Last 12 Months
+				<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartLostEnergy').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.LostEnergy(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<!-- <div id="chartDTLostEnergyCustomTooltip"></div> -->
+					<div id="chartLostEnergy"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="col-sm-4 col-sm-4">
+		<div class="col-md-3 col-sm-4 no-padding">
+			<div class="pad box-pane-right bg-white col-summary">
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">No. of Sites</div>
+					<h4 class="description-header first-city" data-bind="text:sum.noOfProjects">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">No. of Turbines</div>
+					<h4 class="description-header first-city" data-bind="text:sum.noOfTurbines">0</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Total Max. Capacity</div>
+					<h4 class="description-header first-city" data-bind="text:sum.totalMaxCapacity">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">Currently Down</div>
+					<h4 class="description-header third-city" data-bind="text:sum.currentDown">0</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Down More Than 2 Days</div>
+					<h4 class="description-header third-city" data-bind="text:sum.twoDaysDown">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">Performance vs Budget</div>
+					<h4 class="description-header second-city">0%</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Achievement vs Annual Budget</div>
+					<h4 class="description-header second-city">0%</h4>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-9 col-sm-8 no-padding">
+			<div class="pad">
+				<div id="india-map" style="height: 425px;"></div>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 no-padding">
+		<div class="col-md-12 col-sm-12 ez panel-content">
+			<div class="col-md-4 col-sm-4 hardcore landing border-right-grey border-bottom-grey custom-div">
+				<div class="panel ez no-padding hardcore prod-div">
+					<div class="panel-heading">
+					Production (GWh) - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartProdMonth').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProdMonth(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<h5 class="label-drilldown"><small><center>click on each series to view the drilldown</center></small></h5>
+						<div id="chartProdMonth"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4 col-sm-4 hardcore landing border-right-grey custom-div">
+				<div class="panel ez no-padding hardcore plf-div">
+					<div class="panel-heading">
+					PLF (%) Comparison for all Projects - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartPLF').kendoChart2Grid('n0')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.PLF(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartPLF"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4 col-sm-4 hardcore landing" id="div-windiness">
+				<div class="panel  no-padding hardcore windiness-div border-top-grey custom-div">
+					<div class="panel-heading">
+					Windiness (m/s) - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartWindiness').kendoChart2Grid()">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.Windiness(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartWindinessCustomTooltip"></div>
+						<div id="chartWindiness"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-12 col-sm-12 ez panel-content">
+			<div class="col-md-4 col-sm-4 hardcore landing border-right-grey custom-div">
+				<div class="panel ez no-padding hardcore prod-div">
+					<div class="panel-heading">
+					Production (GWh) - Current Year & Last Year
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartCurrLast').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProdCurLast(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartCurrLast"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-8 col-sm-8 hardcore landing">
+				<div class="panel no-padding hardcore summary-div custom-div border-top-grey">
+					<div class="panel-heading">
+					Summary Data for Last 12 Months
+					</div>
+					<div class="panel-body panel-summary gridSummaryData" style="height: 185px;">
+						<div id="gridSummaryData"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<div data-bind="visible:sum.isDetailProd">
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12">
+			<ul class="nav nav-pills nav-replace-title" role="tablist">
+				<li role="presentation" class="active">
+					<a role="tab" data-toggle="tab" class="btn-back" data-bind="click:sum.backToDashboard()"><i class="fa fa-reply" aria-hidden="true"></i> Back </a>
+				</li>
+			</ul>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 ez panel-content" id="divChartDetail">
+		<div class="col-md-12 col-sm-12 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">Detail Production<span data-bind="text:sum.detailProdMsTxt"></span> <span class="fa fa-angle-double-right"></span>&nbsp;<strong><span data-bind="text:sum.detailProdTxt"></span></strong></div>
+				<div class="panel-body">
+					<div class="col-md-8">
+						<div id="chartDetailProduction"></div>
+						<div class="clearfix">&nbsp;</div>
+					</div>
+					<div class="col-md-4">
+						<div id="gridDetailProduction"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div data-bind="visible:sum.isDetailProdByProject">
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12">
+			<ul class="nav nav-pills nav-replace-title" role="tablist">
+				<li role="presentation" class="active">
+					<a role="tab" data-toggle="tab" class="btn-back" data-bind="click:sum.toDetailProduction()"><i class="fa fa-reply" aria-hidden="true"></i> Back</a>
+				</li>
+			</ul>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading"><span data-bind="text:sum.detailProdProjectTxt"></span>&nbsp;<span class="fa fa-angle-double-right"></span>&nbsp;<strong><span data-bind="text:sum.detailProdDateTxt"></strong></div>
+				<div class="panel-body">
+					<div class="col-md-8">
+						<div id="chartDetailProdByProject"></div>
+						<div class="clearfix">&nbsp;</div>
+					</div>
+					<div class="col-md-4">
+						<div id="gridDetailProdByProject"></div>
+					</div>
+
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/web/view/page-dashboard-summary_REMOTE_55592.html b/web/view/page-dashboard-summary_REMOTE_55592.html
new file mode 100644
index 00000000..ae8e0985
--- /dev/null
+++ b/web/view/page-dashboard-summary_REMOTE_55592.html
@@ -0,0 +1,385 @@
+<script src="{{BaseUrl}}res/core/js/page-dashboard-summary.js?ANTI_CACHE={{.AntiCache}}"></script>
+
+<script id="templateProd" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: kendo.toString(kendo.parseDate(vm.dateAsOf()), 'dd MMM yyyy') # #: category #:00</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n2') # kWh</span></div>
+  # } #
+</script>
+
+<script id="templateCum" type="text/x-kendo-template">
+  <div><b>#: kendo.toString(kendo.parseDate(category), 'dd MMM yyyy') #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1') # GWh</span></div>
+  # } #
+</script>
+<script id="templateAvail" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1') # %</span></div>
+  # } #
+</script>
+<script id="templateAvailPercentage" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'p1') #</span></div>
+  # } #
+</script>
+<script id="templateProdMonth" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(kendo.format('{0:n2}',points[i].value), 2)# GWh</span></div>
+  # } #
+</script>
+<!-- <script id="templateDTLEbyType" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { 
+  		if(i==0) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# MWh</span></div>
+  # 	} else if(i==1) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# hours</span></div>
+  # 	} else if(i==2) { #
+    		<div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: points[i].value # times</span></div>
+  # 	}
+  	} #
+</script> -->
+<script id="templateDTLEbyType" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { 
+        if(points[i].series.name == 'Frequency') { #
+            <tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n0')#</td></tr></table>
+  #     } else if (points[i].series.name == 'Duration') { #
+            <tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n1')# Hours</td></tr>
+  #     } else { #
+            <table><tr><td>#: points[i].series.name# </td><td>:</td><td> #: kendo.toString(points[i].value, 'n1')# MWh</td></tr>
+  #     }
+    } #
+</script>
+<script id="templateDowntimeLostEnergy" type="text/x-kendo-template">
+  <div><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# MWh</span></div>
+  # } #
+</script>
+<script id="templateWindiness" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# m/s</span></div>
+  # } #
+</script>
+<script id="templateWindiness" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'n1')# %</span></div>
+  # } #
+</script>
+<script id="templateDistribution" type="text/x-kendo-template">
+  <div style="text-align:center"><b>#: category #</b></div>
+  # for (var i = 0; i < points.length; i++) { #
+    <div style="text-align:left">#: points[i].series.name# : <span style="float:right!important">#: kendo.toString(points[i].value, 'p1') #</span></div>
+  # } #
+</script>
+
+<div data-bind="visible:lgd.isSummary">
+	<div class="col-md-8 col-sm-8">
+		<div class="col-md-6 col-sm-6 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Production (kWh) - Last 24 Hours
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs prodToTable" onclick="$('#chartProduction').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProductionChart(sum.dataSource().Productions)">
+                              <input type="radio" name="convert" id="tochart" value="tochart" autofocus="true"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<div id="chartProductionCustomTooltip"></div>
+					<div id="chartProduction"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Availability (%) - Last 12 Months
+        		<span class="tools pull-right">
+        			  <i class="fa fa-question-circle tooltipster tooltipstered" aria-hidden="true" title="Information"></i>
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartAbility').kendoChart2Grid('n1')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.AvailabilityChart(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<div id="chartAbility"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+					Cumulative Production (GWh) - Month to Date
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartCumProduction').kendoChart2Grid('n1','dd-MMM-yyyy')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.CumProduction(sum.dataSource().CummulativeProductions)">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<!--<h5 class="label-drilldown"><small><center>click on each series to view the drilldown</center></small></h5>-->
+					<div id="chartCumProduction"></div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6 col-sm-6 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">
+				Lost Energy (GWh) - Last 12 Months
+				<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartLostEnergy').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.LostEnergy(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+				</div>
+				<div class="panel-body" style="height: 185px;">
+					<!-- <div id="chartDTLostEnergyCustomTooltip"></div> -->
+					<div id="chartLostEnergy"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="col-sm-4 col-sm-4">
+		<div class="col-md-3 col-sm-4 no-padding">
+			<div class="pad box-pane-right bg-white col-summary">
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">No. of Sites</div>
+					<h4 class="description-header first-city" data-bind="text:sum.noOfProjects">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">No. of Turbines</div>
+					<h4 class="description-header first-city" data-bind="text:sum.noOfTurbines">0</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Total Max. Capacity</div>
+					<h4 class="description-header first-city" data-bind="text:sum.totalMaxCapacity">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">Currently Down</div>
+					<h4 class="description-header third-city" data-bind="text:sum.currentDown">0</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Down More Than 2 Days</div>
+					<h4 class="description-header third-city" data-bind="text:sum.twoDaysDown">0</h4>
+				</div>
+				<div class="description-block">
+					<div class="sparkbar pad" data-color="#fff">Performance vs Budget</div>
+					<h4 class="description-header second-city">0%</h4>
+				</div>
+				<div class="description-block margin-bottom">
+					<div class="sparkbar pad" data-color="#fff">Achievement vs Annual Budget</div>
+					<h4 class="description-header second-city">0%</h4>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-9 col-sm-8 no-padding">
+			<div class="pad">
+				<div id="india-map" style="height: 446.5px;"></div>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 no-padding">
+		<div class="col-md-12 col-sm-12 ez panel-content">
+			<div class="col-md-4 col-sm-4 hardcore landing">
+				<div class="panel ez no-padding hardcore prod-div">
+					<div class="panel-heading">
+					Production (GWh) - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartProdMonth').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProdMonth(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<h5 class="label-drilldown"><small><center>click on each series to view the drilldown</center></small></h5>
+						<div id="chartProdMonth"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4 col-sm-4 hardcore landing">
+				<div class="panel ez no-padding hardcore plf-div">
+					<div class="panel-heading">
+					PLF (%) Comparison for all Projects - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartPLF').kendoChart2Grid('n0')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.PLF(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartPLF"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4 col-sm-4 hardcore landing" id="div-windiness">
+				<div class="panel ez no-padding hardcore windiness-div">
+					<div class="panel-heading">
+					Windiness (m/s) - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartWindiness').kendoChart2Grid()">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.Windiness(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartWindinessCustomTooltip"></div>
+						<div id="chartWindiness"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4 col-sm-4 hardcore landing" id="div-winddistribution">
+				<div class="panel ez no-padding hardcore winddistribution-div">
+					<div class="panel-heading">
+					Wind Distribution - Last 12 Months
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartWindDistribution').kendoChart2Grid()">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.WindDistribution(sum.dataSourceWindDistribution())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartWindDistributionCustomTooltip"></div>
+						<div id="chartWindDistribution"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-12 col-sm-12 ez panel-content">
+			<div class="col-md-4 col-sm-4 hardcore landing">
+				<div class="panel ez no-padding hardcore prod-div">
+					<div class="panel-heading">
+					Production (GWh) - Current Year & Last Year
+					<span class="tools pull-right">
+                      <div class="btn-group" data-toggle="buttons">
+                          <label class="btn btn-primary btn-xs" onclick="$('#chartCurrLast').kendoChart2Grid('n2')">
+                              <input type="radio" name="convert" id="totable" value="totable" ><i class="fa fa-table"></i>
+                          </label>
+                          <label class="btn btn-primary btn-xs" onclick="sum.ProdCurLast(sum.dataSourceScada())">
+                              <input type="radio" name="convert" id="tochart" value="tochart"><i class="fa fa-bar-chart"></i>
+                          </label>
+                      </div>
+                  </span>
+					</div>
+					<div class="panel-body" style="height: 185px;">
+						<div id="chartCurrLast"></div>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-8 col-sm-8 hardcore landing">
+				<div class="panel ez no-padding hardcore summary-div">
+					<div class="panel-heading">
+					Summary Data for Last 12 Months
+					</div>
+					<div class="panel-body panel-summary gridSummaryData" style="height: 185px;">
+						<div id="gridSummaryData"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div data-bind="visible:sum.isDetailProd">
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12">
+			<ul class="nav nav-pills nav-replace-title" role="tablist">
+				<li role="presentation" class="active">
+					<a role="tab" data-toggle="tab" class="btn-back" data-bind="click:sum.backToDashboard()"><i class="fa fa-reply" aria-hidden="true"></i> Back </a>
+				</li>
+			</ul>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 ez panel-content" id="divChartDetail">
+		<div class="col-md-12 col-sm-12 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading">Detail Production<span data-bind="text:sum.detailProdMsTxt"></span> <span class="fa fa-angle-double-right"></span>&nbsp;<strong><span data-bind="text:sum.detailProdTxt"></span></strong></div>
+				<div class="panel-body">
+					<div class="col-md-8">
+						<div id="chartDetailProduction"></div>
+						<div class="clearfix">&nbsp;</div>
+					</div>
+					<div class="col-md-4">
+						<div id="gridDetailProduction"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div data-bind="visible:sum.isDetailProdByProject">
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12">
+			<ul class="nav nav-pills nav-replace-title" role="tablist">
+				<li role="presentation" class="active">
+					<a role="tab" data-toggle="tab" class="btn-back" data-bind="click:sum.toDetailProduction()"><i class="fa fa-reply" aria-hidden="true"></i> Back</a>
+				</li>
+			</ul>
+		</div>
+	</div>
+	<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12 hardcore landing">
+			<div class="panel ez no-padding hardcore">
+				<div class="panel-heading"><span data-bind="text:sum.detailProdProjectTxt"></span>&nbsp;<span class="fa fa-angle-double-right"></span>&nbsp;<strong><span data-bind="text:sum.detailProdDateTxt"></strong></div>
+				<div class="panel-body">
+					<div class="col-md-8">
+						<div id="chartDetailProdByProject"></div>
+						<div class="clearfix">&nbsp;</div>
+					</div>
+					<div class="col-md-4">
+						<div id="gridDetailProdByProject"></div>
+					</div>
+
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/web/view/page-dashboard.html b/web/view/page-dashboard.html
index 5a0139ff..3c9eb7e5 100644
--- a/web/view/page-dashboard.html
+++ b/web/view/page-dashboard.html
@@ -8,25 +8,25 @@
 <link rel="stylesheet" type="text/css" href="{{BaseUrl}}res/core/css/page-dashboard.css">
 
 <div class="row">
-	<div class="col-md-12" style="padding-left: 10px;" data-bind="visible:vm.isDashboard">
+	<div class="col-md-12 filter-section" data-bind="visible:vm.isDashboard">
 		<ul class="nav nav-pills nav-replace-title" role="tablist">
-			<li>
-				<div class="input-group input-group-sm ez margin-bottom-10 margin-right-5">
-					<div class="width-full">
-						<select type="text" id="projectId" class="dropdownFilter" data-bind="kendoDropDownList: { value: lgd.projectName, data: lgd.projectList, dataTextField: 'text', dataValueField: 'value', change:lgd.LoadData, suggest: true}"></select>
-					</div>
-				</div>
-			</li>
 			<div class="inline-tab">&nbsp;</div>
-			<li role="presentation" class="active tab-summary">
+			<li role="presentation" class="active tab-summary dashboard-tab">
 				<a role="tab" data-toggle="tab" id="tabSummary">Summary</a>
 			</li>
-			<li role="presentation" class="tab-production">
+			<li role="presentation" class="tab-production dashboard-tab">
 				<a role="tab" data-toggle="tab" id="tabProduction">Production</a>
 			</li>
 			<li role="presentation" class="tab-downtime">
 				<a role="tab" data-toggle="tab" id="tabAvailability">Availability</a>
 			</li>
+			<li>
+				<div class="input-group input-group-sm ez margin-bottom-10 margin-right-5">
+					<div class="width-full">
+						<select type="text" id="projectId" class="dropdownFilter" data-bind="kendoDropDownList: { value: lgd.projectName, data: lgd.projectList, dataTextField: 'text', dataValueField: 'value', change:lgd.LoadData, suggest: true}"></select>
+					</div>
+				</div>
+			</li>
 		</ul>
 	</div>
 
diff --git a/web/view/page-monitoring/by-project.html b/web/view/page-monitoring/by-project.html
index 49c1a84e..f8499e1c 100644
--- a/web/view/page-monitoring/by-project.html
+++ b/web/view/page-monitoring/by-project.html
@@ -7,14 +7,12 @@
 <link rel="stylesheet" type="text/css" href="{{BaseUrl}}res/core/css/page-filter-analytic.css">
 
 <div class="row">
-    <div class="row">
-        <div class="col-md-12 col-sm-12 ez panel-content">
-            <div class="nav nav-pills nav-replace-title" style="padding-left: 5px;">
-                <div class="col-md-12 col-sm-12 filter-content">
-                    <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
-                    <select class="col-md-1 col-sm-1 project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: bp.projectList, dataValueField: 'value', dataTextField: 'text', suggest: true }"
+    <div class="col-md-12 filter-section">
+        <div class="nav nav-pills nav-replace-title" role="tablist">
+            <div class="col-md-12 filter-content">
+                <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
+               <select class="col-md-1 col-sm-1 project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: bp.projectList, dataValueField: 'value', dataTextField: 'text', suggest: true }"
                     style="width:145px"></select>&nbsp;
-                </div>
             </div>
         </div>
     </div>
diff --git a/web/view/page-monitoring/individual-turbine.html b/web/view/page-monitoring/individual-turbine.html
index 77d7d39c..10d1276d 100644
--- a/web/view/page-monitoring/individual-turbine.html
+++ b/web/view/page-monitoring/individual-turbine.html
@@ -10,17 +10,15 @@
 <script src="{{BaseUrl}}res/highstock/value-in-legend.js"></script>
 
 <div class="row">
-    <div class="row">
-        <div class="col-md-12 col-sm-12 ez panel-content">
-            <div class="nav nav-pills nav-replace-title">
-                <div class="col-md-12 col-sm-12 filter-content">
-                    <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
-                    <select class="col-md-1 col-sm-1 project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: it.projectList, dataValueField: 'value', dataTextField: 'text', suggest: true, change: it.ChangeProject() }"
-                    style="width:145px"></select>&nbsp;
-                    <label class="col-md-1 col-sm-1 control-label label-filter">Turbine</label>
-                    <select class="col-md-1 col-sm-1 project-list" id="turbine" name="table" data-bind="kendoDropDownList: { data: it.turbineList, dataValueField: 'Id', dataTextField: 'Id', suggest: true, change: it.ChangeSelection() }"
-                    style="width:145px"></select>&nbsp;
-                </div>
+    <div class="col-md-12 filter-section">
+        <div class="nav nav-pills nav-replace-title" role="tablist">
+            <div class="col-md-12 filter-content">
+                <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
+                <select class="col-md-1 col-sm-1 project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: it.projectList, dataValueField: 'value', dataTextField: 'text', suggest: true, change: it.ChangeProject() }"
+                style="width:145px"></select>&nbsp;
+                <label class="col-md-1 col-sm-1 control-label label-filter">Turbine</label>
+                <select class="col-md-1 col-sm-1 project-list" id="turbine" name="table" data-bind="kendoDropDownList: { data: it.turbineList, dataValueField: 'Id', dataTextField: 'Id', suggest: true, change: it.ChangeSelection() }"
+                style="width:145px"></select>&nbsp;
             </div>
         </div>
     </div>
@@ -29,7 +27,7 @@
         <div class="col-md-12 col-sm-12 hardcore landing">
             <div class="panel ez no-padding hardcore mb-5">
                 <div class="panel-body">
-                    <div class="col-md-5 border-right-grey">
+                    <div class="col-md-5 border-right-grey mt-15">
                         <div class="col-md-12 onTop">
                               <div class="col-md-12 pull-left"><a href="#" onclick="it.ToTimeSeriesHfd()" ><i class="fa fa-arrow-right"></i> Go to Analysis</a></div>
                         </div>
@@ -95,7 +93,7 @@ <h5><strong>Critical Temperature & Pressure</strong></h5>
                                  <hr class="borderGrey">
                                 <strong><span>Gen. 1 phase 3 coil</span></strong><strong><span class="pull-right" data-bind="text: it.temp_gen_coil3()"></span></strong>
                             </div>
-                            <div class="col-md-6 border-left-grey">
+                            <div class="col-md-6 border-left-grey" style="margin-bottom: 22px;">
                                  <span><strong>Gen. bearing  : </strong></span>
                                   <hr class="borderGrey">
                                  <span>Drive</span><strong><span class="pull-right" data-bind="text: it.temp_gen_bearing_driven()"></span></strong>
@@ -124,11 +122,12 @@ <h5><strong>Critical Temperature & Pressure</strong></h5>
                         </div>
                         <div class="clearfix">&nbsp;</div>
                     </div>
-                    <div class="col-md-4 turbine-pic-part border-left-grey">
+                    <div class="col-md-4 turbine-pic-part border-left-grey mt-15">
                         <div class="col-md-12 marginbottom20">
                             <a href="#"  onclick="it.ToByProject()" class="pull-right"><i class="fa fa-mail-reply"></i> Go to project</a>
                         </div>
                         {{template "turbine-pic.html"}}
+                         <div class="clearfix" style="margin-bottom: 12px;">&nbsp;</div>
                     </div>
                 </div>
             </div>
diff --git a/web/view/page-monitoring/weather-forecast.html b/web/view/page-monitoring/weather-forecast.html
index 5a7d41af..2b36bc35 100644
--- a/web/view/page-monitoring/weather-forecast.html
+++ b/web/view/page-monitoring/weather-forecast.html
@@ -6,14 +6,12 @@
 <link rel="stylesheet" type="text/css" href="{{BaseUrl}}res/core/css/page-monitoring/monitoring.css">
 <link rel="stylesheet" type="text/css" href="{{BaseUrl}}res/core/css/page-filter-analytic.css">
 <div class="row">
-    <div class="row">
-        <div class="col-md-12 col-sm-12 ez panel-content">
-            <div class="nav nav-pills nav-replace-title" style="padding-left: 5px;">
-                <div class="col-md-12 col-sm-12 filter-content">
-                    <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
-                    <select class="col-md-1 col-sm-1 project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: wf.projectList, dataValueField: 'value', dataTextField: 'text', suggest: true }"
+    <div class="col-md-12 filter-section">
+        <div class="nav nav-pills nav-replace-title" role="tablist">
+            <div class="col-md-12 filter-content">
+                <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
+                <select class="col-md-1 col-sm-1 project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: wf.projectList, dataValueField: 'value', dataTextField: 'text', suggest: true }"
                     style="width:145px"></select>&nbsp;
-                </div>
             </div>
         </div>
     </div>
diff --git a/web/view/page-time-series.html b/web/view/page-time-series.html
index a194576b..14ea29c0 100644
--- a/web/view/page-time-series.html
+++ b/web/view/page-time-series.html
@@ -25,7 +25,7 @@
 <div>
 	<div class="row">
 		{{template "page-filter-scatter.html"}}
-		<div class="col-md-12 col-sm-12 ez panel-content">
+		<div class="col-md-12 col-sm-12 ez panel-content" style="margin-top: -5px;">
 			<div class="col-md-12 col-sm-12 hardcore landing">
 				<div class="panel ez no-padding hardcore">
 					<div class="panel-body">
diff --git a/web/view/page-windfarm-analysis.html b/web/view/page-windfarm-analysis.html
index b0e94fad..64914916 100644
--- a/web/view/page-windfarm-analysis.html
+++ b/web/view/page-windfarm-analysis.html
@@ -15,40 +15,38 @@
 <link rel="stylesheet" type="text/css" href="{{BaseUrl}}res/core/css/page-windfarm-analysis.css">
 
 <div class="row">
-    <div class="row">
-        <div class="col-md-12 col-sm-12 ez panel-content">
-            <div class="nav nav-pills nav-replace-title" style="padding-left: 5px;">
-                <div class="col-md-12 col-sm-12 filter-content">
-                    <div data-bind="visible: wfa.isProjectTab()">
-                        <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
-                        <select class="col-md-1 col-sm-1 project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: wfa.ProjectList, dataValueField: 'value', dataTextField: 'text', suggest: true }"
+    <div class="col-md-12 filter-section">
+        <div class="nav nav-pills nav-replace-title" role="tablist">
+           <div class="col-md-12 col-sm-12 filter-content">
+                <div data-bind="visible: wfa.isProjectTab()">
+                    <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
+                    <select class="col-md-1 col-sm-1 project-list" id="projectList" name="table" data-bind="kendoDropDownList: { data: wfa.ProjectList, dataValueField: 'value', dataTextField: 'text', suggest: true, change: wfa.ProjectAnalysis.LoadData}"
+                    style="width:150px">
+                    </select>
+                </div>
+                <div data-bind="visible:wfa.isTurbine1Tab()">
+                    <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
+                    <select class="col-md-1 col-sm-4 project-list" id="projectTurbine1List" name="table" data-bind="kendoDropDownList: { data: wfa.ProjectList, dataValueField: 'value', dataTextField: 'text', suggest: true , change: wfa.Turbine1Analysis.LoadData}"
                         style="width:150px">
-                        </select>
-                    </div>
-                    <div data-bind="visible:wfa.isTurbine1Tab()">
-                        <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
-                        <select class="col-md-1 col-sm-4 project-list" id="projectTurbine1List" name="table" data-bind="kendoDropDownList: { data: wfa.ProjectList, dataValueField: 'value', dataTextField: 'text', suggest: true }"
-                            style="width:150px">
-                        </select>
-                        <label class="col-md-1 col-sm-1 control-label label-filter">Turbine</label>
-                        <select class="col-md-11 col-sm-6 turbine-list" id="turbine1List" name="table" data-bind="kendoMultiSelect: { data: wfa.TurbineList, dataValueField: 'value', dataTextField: 'text', change: function() {wfa.checkTurbine('turbine1List')}, suggest: true }"
-                            style="width:320px" onblur="wfa.Turbine1Analysis.LoadData()">
-                        </select>
-                    </div>
-                    <div data-bind="visible:wfa.isTurbine2Tab()">
-                        <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
-                        <select class="col-md-1 col-sm-4 project-list" id="projectTurbine2List" name="table" data-bind="kendoDropDownList: { data: wfa.ProjectList, dataValueField: 'value', dataTextField: 'text', suggest: true }"
-                            style="width:150px">
-                        </select>
-                        <label class="col-md-1 col-sm-1 control-label label-filter">Turbine</label>
-                        <select class="col-md-11 col-sm-6 turbine-list" id="turbine2List" name="table" data-bind="kendoMultiSelect: { data: wfa.TurbineList, dataValueField: 'value', dataTextField: 'text', change: function() {wfa.checkTurbine('turbine2List')}, suggest: true }"
-                            style="width:320px">
-                        </select>
-                    </div>
-                    &nbsp;&nbsp;
-                    <div class="search-btn-line">&nbsp;</div>
-                    <button type="button" id="btnRefresh" class="btn btn-sm btn-primary btn-filter-refresh"><i class="fa fa-refresh"></i>&nbsp;Refresh</button>
+                    </select>
+                    <label class="col-md-1 col-sm-1 control-label label-filter">Turbine</label>
+                    <select class="col-md-11 col-sm-6 turbine-list" id="turbine1List" name="table" data-bind="kendoMultiSelect: { data: wfa.TurbineList, dataValueField: 'value', dataTextField: 'text', change: function() {wfa.checkTurbine('turbine1List')}, suggest: true }"
+                        style="width:320px" onblur="wfa.Turbine1Analysis.LoadData()">
+                    </select>
+                </div>
+                <div data-bind="visible:wfa.isTurbine2Tab()">
+                    <label class="col-md-1 col-sm-1 control-label label-filter">Project</label>
+                    <select class="col-md-1 col-sm-4 project-list" id="projectTurbine2List" name="table" data-bind="kendoDropDownList: { data: wfa.ProjectList, dataValueField: 'value', dataTextField: 'text', suggest: true , change: wfa.Turbine2Analysis.LoadData}"
+                        style="width:150px">
+                    </select>
+                    <label class="col-md-1 col-sm-1 control-label label-filter">Turbine</label>
+                    <select class="col-md-11 col-sm-6 turbine-list" id="turbine2List" name="table" data-bind="kendoMultiSelect: { data: wfa.TurbineList, dataValueField: 'value', dataTextField: 'text', change: function() {wfa.checkTurbine('turbine2List')}, suggest: true }"
+                        style="width:320px">
+                    </select>
                 </div>
+                &nbsp;&nbsp;
+                <div class="search-btn-line">&nbsp;</div>
+                <button type="button" id="btnRefresh" class="btn btn-sm btn-primary btn-filter-refresh"><i class="fa fa-refresh"></i>&nbsp;Refresh</button>
             </div>
         </div>
     </div>