diff --git a/default-schemas.json b/default-schemas.json
index 48d9719..59a6893 100644
--- a/default-schemas.json
+++ b/default-schemas.json
@@ -1,6 +1,6 @@
 {
   "endpoint": "",
   "schema": "",
-  "uischema": "uischema-00.06.json",
+  "uischema": "uischema-00.07.json",
   "config": ""
 }
diff --git a/package-lock.json b/package-lock.json
index c0491bc..ab324a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10032,6 +10032,11 @@
         "invert-kv": "^2.0.0"
       }
     },
+    "leaflet": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.4.0.tgz",
+      "integrity": "sha512-x9j9tGY1+PDLN9pcWTx9/y6C5nezoTMB8BLK5jTakx+H7bPlnbCHfi9Hjg+Qt36sgDz/cb9lrSpNQXmk45Tvhw=="
+    },
     "left-pad": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
@@ -13834,6 +13839,53 @@
       "resolved": "https://registry.npmjs.org/react-jsonschema-form-pagination/-/react-jsonschema-form-pagination-0.3.12.tgz",
       "integrity": "sha512-1x0kqEynuX/3BkiaggnYZeBOEEsOU44eopuc3cubHV2C4i3GtERJBwxREjvyaBEDzyZe8bUsxNKWUV45BIY1SQ=="
     },
+    "react-leaflet": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-2.4.0.tgz",
+      "integrity": "sha512-ex9MAz2cUAmdUucsjv180OYszdqxHIyEwzWAuMOOuxE7yUmRscxZKR5h0f+vG4shR+SekZYUBk0+gCv8apRADQ==",
+      "requires": {
+        "@babel/runtime": "^7.4.5",
+        "fast-deep-equal": "^2.0.1",
+        "hoist-non-react-statics": "^3.3.0",
+        "warning": "^4.0.3"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.6.0",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.0.tgz",
+          "integrity": "sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==",
+          "requires": {
+            "regenerator-runtime": "^0.13.2"
+          }
+        },
+        "hoist-non-react-statics": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
+          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+          "requires": {
+            "react-is": "^16.7.0"
+          }
+        },
+        "react-is": {
+          "version": "16.9.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz",
+          "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="
+        },
+        "regenerator-runtime": {
+          "version": "0.13.3",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+          "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+        },
+        "warning": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
+        }
+      }
+    },
     "react-lifecycles-compat": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
diff --git a/package.json b/package.json
index d2ea32f..922a8af 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,7 @@
     "jsonwebtoken": "^8.3.0",
     "jszip": "^3.1.5",
     "jszip-utils": "0.0.2",
+    "leaflet": "^1.4.0",
     "list-react-files": "^0.2.0",
     "local-storage-fallback": "^4.1.1",
     "lodash": "^4.17.11",
@@ -111,6 +112,7 @@
     "react-json-view": "^1.19.1",
     "react-jsonschema-form": "1.7.0",
     "react-jsonschema-form-pagination": "^0.3.12",
+    "react-leaflet": "^2.4.0",
     "react-onclickout": "^2.0.8",
     "react-redux": "^5.0.7",
     "react-router-dom": "^4.3.1",
diff --git a/src/browser/img/logo-sidebar-small.svg b/src/browser/img/logo-sidebar-small.svg
new file mode 100644
index 0000000..739b55d
--- /dev/null
+++ b/src/browser/img/logo-sidebar-small.svg
@@ -0,0 +1 @@
+<svg version="1.1" viewBox="0.0 0.0 500.0 500.0" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="g61f27a95b0_0_0.0"><path d="m0 0l500.0 0l0 500.0l-500.0 0l0 -500.0z" clip-rule="nonzero"/></clipPath><g clip-path="url(#g61f27a95b0_0_0.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l500.0 0l0 500.0l-500.0 0z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m217.79538 94.99752l0 0c0 -28.657928 23.231842 -51.889763 51.88977 -51.889763l0 0c13.762024 0 26.960388 5.466938 36.69159 15.198158c9.731232 9.731216 15.198181 22.92958 15.198181 36.691605l0 0c0 28.65792 -23.231842 51.889763 -51.88977 51.889763l0 0c-28.657928 0 -51.88977 -23.231842 -51.88977 -51.889763z" fill-rule="evenodd"/><path stroke="#ffffff" stroke-width="8.0" stroke-linejoin="round" stroke-linecap="butt" d="m217.79538 94.99752l0 0c0 -28.657928 23.231842 -51.889763 51.88977 -51.889763l0 0c13.762024 0 26.960388 5.466938 36.69159 15.198158c9.731232 9.731216 15.198181 22.92958 15.198181 36.691605l0 0c0 28.65792 -23.231842 51.889763 -51.88977 51.889763l0 0c-28.657928 0 -51.88977 -23.231842 -51.88977 -51.889763z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m289.8588 216.86525l0 0c0 -44.095795 35.746735 -79.842514 79.84253 -79.842514l0 0c21.175537 0 41.483795 8.411957 56.457184 23.38533c14.973389 14.973373 23.385345 35.28163 23.385345 56.457184l0 0c0 44.09581 -35.746735 79.842514 -79.84253 79.842514l0 0c-44.095795 0 -79.84253 -35.746704 -79.84253 -79.842514z" fill-rule="evenodd"/><path stroke="#ffffff" stroke-width="12.0" stroke-linejoin="round" stroke-linecap="butt" d="m289.8588 216.86525l0 0c0 -44.095795 35.746735 -79.842514 79.84253 -79.842514l0 0c21.175537 0 41.483795 8.411957 56.457184 23.38533c14.973389 14.973373 23.385345 35.28163 23.385345 56.457184l0 0c0 44.09581 -35.746735 79.842514 -79.84253 79.842514l0 0c-44.095795 0 -79.84253 -35.746704 -79.84253 -79.842514z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m66.99984 335.70612l0 0c0 -59.92508 48.578865 -108.50395 108.503944 -108.50395l0 0c28.777023 0 56.375427 11.431625 76.72386 31.780075c20.348434 20.34842 31.780075 47.94684 31.780075 76.72388l0 0c0 59.92505 -48.578873 108.50394 -108.50394 108.50394l0 0c-59.92508 0 -108.503944 -48.578888 -108.503944 -108.50394z" fill-rule="evenodd"/><path stroke="#ffffff" stroke-width="16.0" stroke-linejoin="round" stroke-linecap="butt" d="m66.99984 335.70612l0 0c0 -59.92508 48.578865 -108.50395 108.503944 -108.50395l0 0c28.777023 0 56.375427 11.431625 76.72386 31.780075c20.348434 20.34842 31.780075 47.94684 31.780075 76.72388l0 0c0 59.92505 -48.578873 108.50394 -108.50394 108.50394l0 0c-59.92508 0 -108.503944 -48.578888 -108.503944 -108.50394z" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/src/browser/img/logo-sidebar.png b/src/browser/img/logo-sidebar.png
index c828be8..290dc38 100644
Binary files a/src/browser/img/logo-sidebar.png and b/src/browser/img/logo-sidebar.png differ
diff --git a/src/browser/img/logo.png b/src/browser/img/logo.png
index 83e7d5d..b89e3ab 100644
Binary files a/src/browser/img/logo.png and b/src/browser/img/logo.png differ
diff --git a/src/browser/index.html b/src/browser/index.html
index 72ee626..f48a7f2 100644
--- a/src/browser/index.html
+++ b/src/browser/index.html
@@ -10,6 +10,11 @@
       href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAdnJLH8AAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAAATwAAAE8BY4r91wAABmZJREFUWMO1ln1sE+cdx393vvP59ezYjm2MHSdpErIYmgJNhiGL2m2VO61srSqjaW/qVKT1TZtAbdVNnQatWLtKBWna2qojtCCoWtLRNRsrTILxktShJAGSOCQOISQ+n40d2+c738Xnl7v9s0glZKljyvfP5/fy/TyPnt+jB4EKFGdF8oMA3U7gyPOCWHJJMhBKDA2XSvLuTQ3GwOZGk1huL3Sl5ux8ATt+Of4iO188muQLnyEo8gsCQ7fJstzN50tvDc2w/ko2Vbb2n5l9bE/PZHCcznoWx/56Ztb3xvFr4VQ2r7lrJyAWSz5eLO1vduiCi2Pr3WSASovBCJPz3jWAogQmQIBaKnZ/nZFFQGYZoWC6awC4AuHVuMK9VGwswjmVGOq0kQRVbj9spQCyDAdlgL09l2IDP1hvP/Pl2NmJpN9lUuub7LpAJD1P9k0yrpmkAA1WLTTZtWHPaj27uB+yUoBTwTkVlZp/fSLG/7jOqn6zc435Qw2Ocv1TjD8U4192W9S/1yoVUv8U86NwKucSiyVQ4wow65Xh762rPtxebzxm0imFigEWdHpsznNxmvlDZr7owlAElwHCm+qr3rkSzvin4sIjNWZ1oGW1/r3mVToIRbPkcJh7kGZyW806/PT3W23PfmuNib4jAACA2aRA0GnRVZRk3GEgwp9evvn29bjww47Gql/XWTXd7fVV2YXcNJ9XvX+e2joS4XbZSKL3IY/lhW+3WNg78b9F/x5J+LYfuJJ59z+zTy6X9/lkyvv0wZHMq59O7gCoYAr+b+NraT+BoRfcFvXflsvb3GgKWHTK7kJR2vm1AVyZZT00k/NuaTQN+dZVM1+V76giepJ8vhrgK8bw0kzGOxzm7tEqFV5AQFDh6Beb7jH2WfQE/eW8KJODFF8ATIEMlgOsxFAqzuWpJQE+GYzaZuZyj0/PCb/54/EppywDqHAUJFmG+bwE3Rej7MsfT5w06/C3HrvfPlRr0bAGDQZapQLyRclWDgACSLVJg99+AlNx3vn+eepIMMJ901GlStzrIv+swpFzq4wqEAsSpPmCLcUXfjKVEPxXo9IDfL50+B+Xbu4yqPGwUYOFZ5K5zdlc8S86FSYvB5DgxBaTDidvARilWPLYQGxnKMZ31lZrrltJ5TPfabGMt9UZZxZyktm89lRwblBDKPxX6eyO4TD7U1mG0a3rbQf2nbg+FqS5jvOhpBsAbiwHwAhFnwJF+28BODGc2HNxmnmuwabdt9FN7nq8zXHbjJp1Sh4AAgAQCMWyXe+dCx8NRriujy7QbFudYS/F5J7oDaXf6J1Ibe9YY7qt/ux4sjoU418duMFs8Dj02wD+NwUjYbZ9aCbzc7dZM/JAs3lJ88VqsuuCrTXkUxiKhPqvpXdE0iKsXa3fzQgF38nRxP7PJ1O+xRf63ETy8OCNzBN1Fs3OtnpjAAAAiaRzxkN91JGrdLbjIY9l28+2OE+Wc5EWdKiX+t3x4fgrnU2m7c9+t7br3Hiy45Ohm6/xYqnVZlCiab4wbNEpvbFMjtOrsIEtTaY/PbrB/veFeqxvMrU2GOFq7AYi0FpDBlZiDgDQXm/oPjGaeIURCl4A6OpsNvf2hlLbRii2dWA6Y0QQREszuX3NDh3nW1s97Fmtv2WEsQSX/4YkyR6PQ3/gXhe54re52aEff+noVUjxhcaFtY4mUxQAouXUY3QqhxQlQKq0eNmfiMUyanAoSfKmSmoxAkcBAYB8SarUH8SiBCVJrmgDqM1ACAgCYiwjOisFSHB5YOeLZT3DtwF4nPpBtRIdG6U4X8+lGLnSBn2h1JPRdA4seuWKLzAAANpg1VxrXqUPJLN5b4LLP7qS4ololvznlbgPw1CqWk/0VwRgN6gK/jb7a3aDSuoNpfd82B9pKbf4SCDy9EQ0u3Wj23Dolw/WVHYCAAD1Vi21oZbcPZ8vkWcnUgeODUQfXq7oZibnfPOz66+P0dnfNto0c+vd5L5KzAEW/Qk//oL291yO7y2UJOd9LvJfWhXWTeDoxVqLGtJ8ARi+aJ2e4zen+cJzNCPa1zn1p7wNVb965D7b2NcCAADw0QXaN50QdgyHWZ8kAYhFaUynwkAslgAAsZYk2eIyqagGm7ZrYy150Ntgmq7UfEmABd1ICM2DM5nOqbiwMcaIQGAouC2qbL1V29vqIk/bDETmTowX9F9WFdzMcTqI8QAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOS0wOC0yMVQyMzo1MTo0NC0wNzowMF5dn44AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTktMDgtMjFUMjM6NTE6NDQtMDc6MDAvACcyAAAAAElFTkSuQmCC"
       type="image/x-icon"
     />
+
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css"
+    integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
+    crossorigin=""/>
+ 
     <style>
 
            /* You can edit the below classes to customize the color scheme of the sidebar.
diff --git a/src/browser/js/browser/DeviceMetaHeaderContainer.js b/src/browser/js/browser/DeviceMetaHeaderContainer.js
index 5321d50..9518ed7 100644
--- a/src/browser/js/browser/DeviceMetaHeaderContainer.js
+++ b/src/browser/js/browser/DeviceMetaHeaderContainer.js
@@ -121,7 +121,7 @@ export class DeviceMetaHeaderContainer extends Component {
     const { bucket } = pathSlice(history.location.pathname);
     return (
       <div>
-        {serverConfig.devicemeta ? (
+        {serverConfig.devicemeta && serverConfig.devicemeta.devices ? (
           <DeviceMetaHeader
             serverConfig={serverConfig}
             currentBucket={bucket}
diff --git a/src/browser/js/browser/SideBar.js b/src/browser/js/browser/SideBar.js
index 5398a29..0b77c5e 100644
--- a/src/browser/js/browser/SideBar.js
+++ b/src/browser/js/browser/SideBar.js
@@ -42,11 +42,9 @@ export const SideBar = ({
         })}
       >
         <div className="fes-header clearfix hidden-sm hidden-xs">
-          <br />
-          <img src={logo} style={{ width: "75%", maxHeight: "70px" }} />
-
+          <img src={logo} style={{ width: "65%", maxHeight: "70px" }} />
           <div className="version-text sb-custom-version">
-            &nbsp;&nbsp;version 02.06.03
+            v03.00.01
           </div>
         </div>
         <div className="fes-list">
diff --git a/src/browser/js/charts/BaseChart.js b/src/browser/js/charts/BaseChart.js
new file mode 100644
index 0000000..c555830
--- /dev/null
+++ b/src/browser/js/charts/BaseChart.js
@@ -0,0 +1,183 @@
+import React from "react";
+import _ from "lodash";
+import hexToRgba from "hex-to-rgba";
+import { HorizontalBar, Bar, Line, Doughnut } from "react-chartjs-2";
+
+const BaseChart = props => {
+  const { datasets, chColors, aspectRatio, chHeight, chartType } = props;
+
+  let chColorsTrans = chColors.map(color =>
+    hexToRgba(color, "0.1")
+  );
+
+  if (datasets.length == 0) {
+    return (
+      <div>
+        <p className="widget-no-data">
+          The widget configuration did not yield any data
+        </p>
+      </div>
+    );
+  }
+
+
+  // set the header labels for use in indexing object properties
+  const device_serialno = datasets[0].label;
+  const time_stamp = datasets[1].label;
+  const parameter = datasets[2].label; // could be extended for multiple parameters
+  const datasetsRestructured = [];
+
+  // set chart specific options
+  const lineOptions = {
+    maintainAspectRatio: aspectRatio,
+    scales: {
+      xAxes: [
+        {
+          gridLines: {
+            display: false
+          },
+          type: "time",
+          time: {
+            unit: "minute",
+            unitStepSize: 1,
+            displayFormats: {
+              second: "MM/DD h:mm:ss",
+              minute: "MM/DD h:mm"
+            }
+          }
+        }
+      ]
+    }
+  };
+
+  const pieOptions = {
+    maintainAspectRatio: aspectRatio,
+    tooltips: {
+      callbacks: {
+        label: function(item, data) {
+          return (
+            data.datasets[item.datasetIndex].label +
+            ": " +
+            data.datasets[item.datasetIndex].data[item.index]
+          );
+        }
+      }
+    }
+  };
+
+  const barOptions = {
+    maintainAspectRatio: aspectRatio,
+    scales: {
+      yAxes: [
+        {
+          gridLines: { display: false },
+          ticks: {
+            beginAtZero: true
+          }
+        }
+      ]
+    }
+  };
+
+  // restructure the dataset to be suitable for the chart types
+  datasets.map(element =>
+    element.data.map(
+      (e, i) =>
+        (datasetsRestructured[i] = {
+          [element.label]: e,
+          ...datasetsRestructured[i]
+        })
+    )
+  );
+
+  // get unique set of device IDs available in the data
+  const deviceIds = [
+    ...new Set(datasetsRestructured.map(x => x[device_serialno]))
+  ];
+
+  // construct array of the data, separated by device (and add labels/colors for each)
+  let datasetsAllDevices = [];
+  let datasetsDevice = [];
+  let pieLabels = [];
+
+  for (let i = 0; i < deviceIds.length; i++) {
+    let datasetsDeviceFiltered = datasetsRestructured.filter(
+      e => e[device_serialno] == deviceIds[i]
+    );
+
+    if (chartType == "line") {
+      datasetsDevice = datasetsDeviceFiltered.map(e => {
+        const x = e[time_stamp];
+        const y = e[parameter];
+        return { x, y };
+      });
+    } else {
+      datasetsDevice = datasetsDeviceFiltered.map(e => {
+        const parameters = _.omit(e, time_stamp, device_serialno);
+        return { parameters };
+      })[0].parameters; // note: If multiple entries for one device, the top one is selected
+      pieLabels = Object.keys(datasetsDevice);
+    }
+
+    datasetsAllDevices[i] = {
+      label: deviceIds[i],
+      data:
+        chartType == "line" ? datasetsDevice : Object.values(datasetsDevice),
+      borderColor: chartType == "line" ? chColors[i] : "#ffffff",
+      backgroundColor:
+        chartType == "line"
+          ? chColorsTrans[i]
+          : (chartType == "bar" || chartType == "horizontal-bar")
+          ? chColors[i]
+          : chColors,
+      hoverBorderColor: chColorsTrans
+    };
+  }
+
+
+
+  return (
+    <div>
+      {datasets ? (
+        chartType == "line" ? (
+          <Line
+            data={{
+              datasets: datasetsAllDevices
+            }}
+            height={chHeight ? chHeight : null}
+            options={lineOptions}
+          />
+        ) : chartType == "pie" ? (
+          <Doughnut
+            data={{
+              datasets: datasetsAllDevices,
+              labels: pieLabels
+            }}
+            height={chHeight ? chHeight : null}
+            options={pieOptions}
+          />
+        ) : chartType == "horizontal-bar" ? (
+          <HorizontalBar
+            data={{
+              datasets: datasetsAllDevices,
+              labels: pieLabels
+            }}
+            height={chHeight ? chHeight : null}
+            options={barOptions}
+          />
+        ) : chartType == "bar" ? (
+          <Bar
+            data={{
+              datasets: datasetsAllDevices,
+              labels: pieLabels
+            }}
+            height={chHeight ? chHeight : null}
+            options={barOptions}
+          />
+        ) : null
+      ) : null}
+    </div>
+  );
+};
+
+export default BaseChart;
diff --git a/src/browser/js/charts/BaseMap.js b/src/browser/js/charts/BaseMap.js
new file mode 100644
index 0000000..7d865b2
--- /dev/null
+++ b/src/browser/js/charts/BaseMap.js
@@ -0,0 +1,116 @@
+import React from "react";
+import _ from "lodash";
+import hexToRgba from "hex-to-rgba";
+import {
+  Map,
+  TileLayer,
+  Popup,
+  Polyline,
+  CircleMarker
+} from "react-leaflet";
+
+const BaseMap = props => {
+  const { datasets, chColors, chHeight } = props;
+
+  let chColorsTrans = chColors.map(color => hexToRgba(color, "0.1"));
+
+  if(datasets.length == 0){
+    return(<div><p className="widget-no-data">The widget configuration did not yield any data</p></div>);
+  }
+
+  // set the header labels for use in indexing object properties
+  const device_serialno = datasets[0].label;
+  const time_stamp = datasets[1].label;
+  const longitude = datasets[2].label; // could be extended for multiple parameters
+  const latitude = datasets[3].label;
+  const datasetsRestructured = [];
+  let bounds = [];
+
+  // restructure the dataset to be suitable
+  datasets.map(element =>
+    element.data.map(
+      (e, i) =>
+        (datasetsRestructured[i] = {
+          [element.label]: e,
+          ...datasetsRestructured[i]
+        })
+    )
+  );
+
+  // get unique set of device IDs available in the data
+  const deviceIds = [
+    ...new Set(datasetsRestructured.map(x => x[device_serialno]))
+  ];
+
+  // construct array of the data, separated by device (and add labels/colors for each)
+  let datasetsAllDevices = [];
+  let datasetsDevice = [];
+
+  for (let i = 0; i < deviceIds.length; i++) {
+    let datasetsDeviceFiltered = datasetsRestructured.filter(
+      e => e[device_serialno] == deviceIds[i] && e[longitude] != ""
+    );
+
+    datasetsDevice = datasetsDeviceFiltered.map(e => {
+      const x = e[longitude];
+      const y = e[latitude];
+      return [x, y];
+    });
+
+    datasetsAllDevices[i] = {
+      label: deviceIds[i],
+      data: datasetsDevice,
+      borderColor: chColors[i],
+      backgroundColor: chColorsTrans[i],
+      hoverBorderColor: chColorsTrans,
+      position: {
+        lat: datasetsDevice[datasetsDevice.length - 1][0],
+        lng: datasetsDevice[datasetsDevice.length - 1][1]
+      }
+    };
+
+    bounds.push(datasetsDevice);
+  }
+
+  return (
+    <div>
+      {datasets ? (
+        <div>
+          <Map
+            bounds={bounds}
+            zoomControl={false}
+            style={{
+              height: chHeight,
+              zIndex: 1
+            }}
+          >
+            <TileLayer
+              attribution='&amp;copy <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+              url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+            />
+            {datasetsAllDevices.map((devices, i) => (
+              <div key={datasetsAllDevices[i].label}>
+                <Polyline
+                  key={datasetsAllDevices[i].label}
+                  positions={datasetsAllDevices[i].data}
+                  color={datasetsAllDevices[i].borderColor}
+                />
+                <CircleMarker
+                  center={datasetsAllDevices[i].position}
+                  color={datasetsAllDevices[i].borderColor}
+                  radius="7"
+                >
+                  <Popup>
+                    <span>{datasetsAllDevices[i].label}</span>
+                  </Popup>
+                </CircleMarker>
+              </div>
+            ))}
+          </Map>
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default BaseMap;
diff --git a/src/browser/js/charts/BaseTable.js b/src/browser/js/charts/BaseTable.js
new file mode 100644
index 0000000..ce16816
--- /dev/null
+++ b/src/browser/js/charts/BaseTable.js
@@ -0,0 +1,81 @@
+import React from "react";
+
+const BaseTable = props => {
+  const { datasets, chColors, chartType, fontSize, chHeight } = props;
+
+  if (datasets.length == 0) {
+    return (
+      <div>
+        <p className="widget-no-data">
+          The widget configuration did not yield any data
+        </p>
+      </div>
+    );
+  }
+
+  // set the header labels for use in indexing object properties
+  const device_serialno = datasets[0].label;
+  const time_stamp = datasets[1].label;
+  const datasetsRestructured = [];
+  let tableData = [];
+  let tableHeader = [];
+  let tableValues = [];
+
+  datasets.map(element =>
+    element.data.map(
+      (e, i) =>
+        (datasetsRestructured[i] = {
+          ...datasetsRestructured[i],
+          [element.label]: e
+        })
+    )
+  );
+
+  if (chartType == "table") {
+    tableData = datasetsRestructured.map(e => {
+      const data = _.omit(e, time_stamp, device_serialno);
+      return { data };
+    });
+
+    tableHeader = (
+      <tr>
+        {Object.keys(tableData[0].data).map((e, index) => {
+          return (
+            <th className="widget-table-head" key={"tableHeader " + index}>
+              <b>{e}</b>
+            </th>
+          );
+        })}
+      </tr>
+    );
+
+    tableValues = tableData.map((e, index) => {
+      return (
+        <tr key={"tableRow " + index}>
+          {Object.values(e.data).map((v, index) => {
+            return <td key={"tableCell " + index}>{v}</td>;
+          })}
+        </tr>
+      );
+    });
+  }
+
+  return (
+    <div>
+      {chartType == "kpi" ? (
+        <div className="widget-kpi" style={{ color: chColors[0] }}>
+          {datasets[2].data[0]}
+        </div>
+      ) : chartType == "table" ? (
+        <div className="widget-table" style={{ fontSize: fontSize, height:chHeight }}>
+          <table className="table">
+            <thead>{tableHeader}</thead>
+            <tbody className="widget-table-table">{tableValues}</tbody>
+          </table>
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default BaseTable;
diff --git a/src/browser/js/charts/LineChart.js b/src/browser/js/charts/LineChart.js
deleted file mode 100644
index f2d348f..0000000
--- a/src/browser/js/charts/LineChart.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import React from "react";
-import { Line } from "react-chartjs-2";
-import hexToRgba from "hex-to-rgba";
-import Moment from "moment";
-
-let lineChartColors = [
-  "#3d85c6",
-  "#073763",
-  "#0b5394",
-  "#6fa8dc",
-  "#9fc5e8",
-  "#e69138",
-  "#ff9900",
-  "#f6b26b",
-  "#f9cb9c"
-];
-
-
-const LineChart = ({ datasets }) => {
-
-  // set the header labels for use in indexing object properties
-  const device_serialno = datasets[0].label
-  const time_stamp = datasets[1].label
-  const parameter = datasets[2].label
-  const datasetsRestructured = [];
-
-  // restructure the dataset to be suitable for Line/Scatter types
-  datasets.map(element =>
-    element.data.map(
-      (e, i) =>
-        (datasetsRestructured[i] = {
-          [element.label]: e,
-          ...datasetsRestructured[i]
-        })
-    )
-  );
-
-  // get unique set of device IDs available in the data
-  const deviceIds = [
-    ...new Set(datasetsRestructured.map(x => x[device_serialno]))
-  ];
-
-  // construct array of the data, separated by device (and add labels/colors for each)
-  let datasetsAllDevices = [];
-  for (let i = 0; i < deviceIds.length; i++) {
-    let datasetsDevice = datasetsRestructured
-      .filter(e => e[device_serialno] == deviceIds[i])
-      .map(e => {
-        const x = Moment(e[time_stamp]).format("MM/DD h:mm:ss");
-        const y = e[parameter];
-        return { x, y };
-      });
-
-    datasetsAllDevices[i] = {
-      label: deviceIds[i],
-      data: datasetsDevice,
-      borderColor: lineChartColors[i],
-      backgroundColor: hexToRgba(lineChartColors[i], "0.1")
-    };
-  }
-
-  return (
-    <div>
-      {datasets ? (
-        <Line
-          data={{
-            datasets: datasetsAllDevices
-          }}
-          options={{
-            scales: {
-              xAxes: [
-                {
-                  gridLines: {
-                    display: false
-                  },
-                  type: "time",
-                  time: {
-                    unit: "minute",
-                    unitStepSize: 1,
-                    displayFormats: {
-                      second: "MM/DD h:mm:ss",
-                      minute: "MM/DD h:mm",
-                    }
-                  }
-                }
-              ]
-            }
-          }}
-        />
-      ) : null}
-    </div>
-  );
-};
-
-export default LineChart;
diff --git a/src/browser/js/charts/index.js b/src/browser/js/charts/index.js
index 1e721b5..0b2dc38 100644
--- a/src/browser/js/charts/index.js
+++ b/src/browser/js/charts/index.js
@@ -1,4 +1,7 @@
 // We can add multiple types of charts and export all from the chart component
-import LineChart from "./LineChart";
+import BaseChart from "./BaseChart";
+import BaseMap from "./BaseMap";
+import BaseTable from "./BaseTable";
 
-export { LineChart };
+
+export { BaseChart, BaseMap, BaseTable};
diff --git a/src/browser/js/dashboard/DashboardSection.js b/src/browser/js/dashboard/DashboardSection.js
index c6fd080..452211b 100644
--- a/src/browser/js/dashboard/DashboardSection.js
+++ b/src/browser/js/dashboard/DashboardSection.js
@@ -2,113 +2,100 @@ import React from "react";
 import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 import * as dashboardActions from "./actions";
-import { LineChart } from "../charts";
+import { BaseChart, BaseMap, BaseTable } from "../charts";
 import { defaults } from "react-chartjs-2";
 
-// example select statements
-// "SELECT time_date, EngineSpeed FROM S3Object WHERE EngineSpeed > '0' limit 200"
-// "SELECT time_date, EngineSpeed FROM S3Object WHERE device_serialno in ['7F34B296'] and time_date > '2019-04-17 21:01:25' and time_date < '2019-04-17 21:05:25' limit 800"
-
-// Notes:
-// Schema to force that minimum one default device is included
-
-// below will later be put into the server Schema/Config:
-let configDashboard = {
-  chart_defaults: {
-    timestamp_header: "time_stamp",
-    device_header: "device_serialno",
-    line_border_width: 2,
-    point_radius: 0,
-    font_size: 8,
-    legend_labels_box_width: 10,
-    legend_labels_padding: 4,
-    show_lines: 0
-  },
-  widgets: [
-    {
-      id: "widget1",
-      title: "Engine Speed (rpm)",
-      chart_type: "line",
-      data_file_name: "test.csv",
-      parameters: "EngineSpeed",
-      def_devices: "'7F34B296', 'AB22438D'",
-      def_start: "2019-04-17 21:01:25",
-      def_end: "2019-04-17 21:09:25",
-      limit: 800,
-      class_name: "col-sm-4"
-    },
-    {
-      id: "widget2",
-      title: "Vehicle Speed (km/h)",
-      chart_type: "line",
-      data_file_name: "test.csv",
-      parameters: "WheelBasedVehicleSpeed",
-      def_devices: "'7F34B296', 'AB22438D'",
-      def_start: "2019-04-17 21:01:25",
-      def_end: "2019-04-17 21:09:25",
-      limit: 800,
-      class_name: "col-sm-4"
-    },
-    {
-      id: "widget3",
-      title: "Engine Fuel Rate",
-      chart_type: "line",
-      data_file_name: "test.csv",
-      parameters: "EngineFuelRate",
-      def_devices: "'7F34B296', 'AB22438D'",
-      def_start: "2019-04-17 21:01:25",
-      def_end: "2019-04-17 21:09:25",
-      limit: 800,
-      class_name: "col-sm-4"
-    }
-  ]
-};
-
-// set chart defaults
-let chDefaults = configDashboard.chart_defaults;
-defaults.global.elements.line.borderWidth = chDefaults.line_border_width;
-defaults.global.elements.point.radius = chDefaults.point_radius;
-defaults.global.defaultFontSize = chDefaults.font_size;
-defaults.global.legend.labels.boxWidth = chDefaults.legend_labels_box_width;
-defaults.global.legend.labels.padding = chDefaults.legend_labels_padding;
-defaults.global.showLines = chDefaults.show_lines;
-
-
-function DashboardWidget(props) {
-  return (
-    <div className={"zero-padding " + props.className}>
-      <div className="dashboard-widget">
-        <span>{props.widgetTitle}</span>
-        <LineChart datasets={props.records.records ? props.records.records.dataset : null} />
-      </div>
-    </div>
-  );
-}
-
+let confDash = null;
+let chDefaults = null;
+let wgt = null;
+let chColors = [];
 
 class DashboardSection extends React.Component {
   constructor(props) {
     super(props);
   }
 
-  componentWillMount() {
-    this.props.prepareWidgetInputs(configDashboard);
-  }
-
   render() {
-    const { recordsArray } = this.props;
+    const { recordsArray, serverConfig } = this.props;
+
+    // upon load of serverConfig, set chart defaults & prepare widget data
+    if (Object.keys(serverConfig).length > 0) {
+      confDash = serverConfig.dashboard;
+      chDefaults = confDash.default_settings;
+      chColors = chDefaults.chart_colors.split(" ");
+      wgt = confDash.widgets;
+
+      defaults.global.elements.line.borderWidth = chDefaults.line_border_width;
+      defaults.global.elements.point.radius = chDefaults.point_radius;
+      defaults.global.defaultFontSize = chDefaults.chart_font_size;
+      defaults.global.legend.labels.boxWidth = chDefaults.legend_labels_box_width;
+      defaults.global.legend.labels.padding = chDefaults.legend_labels_padding;
+
+      this.props.prepareWidgetInputs(serverConfig.dashboard);
+    }
 
     return (
       <div className="feb-container dashboard">
-        {recordsArray.length != 0 ? 
-        <div>{recordsArray.map((records, i) => (
-          <DashboardWidget
-            key={i}
-            widgetTitle={configDashboard.widgets[i].title}
-            className={configDashboard.widgets[i].class_name}
-            records={records}
-          />
-        ))}</div> : null}
+        {confDash != null && recordsArray.length != 0 ? (
+          <div>
+            {recordsArray.map((records, i) => (
+              <div
+                key={"widget " + i}
+                className={
+                  "zero-padding " +
+                  (wgt[i].class_name ? wgt[i].class_name : "col-sm-4")
+                }
+              >
+                <div
+                  className="dashboard-widget"
+                  style={{ height: wgt[i].height }}
+                >
+                  <span className="widget-title">
+                    {wgt[i].title ? wgt[i].title : null}
+                  </span>
+
+                  <div style={{ marginTop: 5 }}>
+                    {!["kpi", "map", "table"].includes(wgt[i].widget_type) ? (
+                      <BaseChart
+                        chartType={wgt[i].widget_type}
+                        chColors={
+                          wgt[i].colors ? wgt[i].colors.split(" ") : chColors
+                        }
+                        aspectRatio={wgt[i].aspect_ratio}
+                        chHeight={wgt[i].height - 60}
+                        datasets={
+                          records.records ? records.records.dataset : null
+                        }
+                      />
+                    ) : ["kpi", "table"].includes(wgt[i].widget_type) ? (
+                      <BaseTable
+                        chartType={wgt[i].widget_type}
+                        chColors={
+                          wgt[i].colors ? wgt[i].colors.split(" ") : chColors
+                        }
+                        chHeight={wgt[i].height - 50}
+                        fontSize={chDefaults.table_font_size}
+                        datasets={
+                          records.records ? records.records.dataset : null
+                        }
+                      />
+                    ) : (
+                      <BaseMap
+                        chColors={
+                          wgt[i].colors ? wgt[i].colors.split(" ") : chColors
+                        }
+                        chHeight={wgt[i].height - 50}
+                        datasets={
+                          records.records ? records.records.dataset : null
+                        }
+                      />
+                    )}
+                  </div>
+                </div>
+              </div>
+            ))}
+          </div>
+        ) : null}
       </div>
     );
   }
@@ -123,7 +110,8 @@ const mapDispatchToProps = dispatch => ({
 
 const mapStateToProps = state => {
   return {
-    recordsArray: state.dashboard.widget
+    recordsArray: state.dashboard.widget,
+    serverConfig: state.browser.serverConfig
   };
 };
 
diff --git a/src/browser/js/dashboard/actions.js b/src/browser/js/dashboard/actions.js
index 275d9aa..060125e 100644
--- a/src/browser/js/dashboard/actions.js
+++ b/src/browser/js/dashboard/actions.js
@@ -1,14 +1,39 @@
 import web from "../web";
 import * as alertActions from "../alert/actions";
+import Moment from "moment";
 export const WIDGET_RESULT = "dashboard/WIDGET_RESULT";
 
+const currentTimestamp = Moment();
+
+// Create S3 Select call to get max of timestamp column across all devices
 export const prepareWidgetInputs = configDashboard => {
-  let chDefaults = configDashboard.chart_defaults;
+  let chDefaults = configDashboard.default_settings;
 
   let recordsArray = _.map(configDashboard.widgets, widget =>
     web.getWidgetQueryResult({
       dataFileName: widget.data_file_name,
-      sqlExpression: `SELECT ${chDefaults.device_header}, ${chDefaults.timestamp_header}, ${widget.parameters} FROM S3Object WHERE ${chDefaults.device_header} in [${widget.def_devices}] and ${chDefaults.timestamp_header} > '${widget.def_start}' and ${chDefaults.timestamp_header} < '${widget.def_end}' limit ${widget.limit}`
+      sqlExpression: `SELECT ${chDefaults.segment_header}, ${
+        chDefaults.timestamp_header
+      }, ${widget.parameters.trim().replace(/ /g, ", ")} FROM S3Object WHERE ${
+        widget.segments
+          ? chDefaults.segment_header +
+            " in ['" +
+            widget.segments.replace(/ /g, "', '") +
+            "'] and "
+          : ""
+      } ${chDefaults.timestamp_header} > '${
+        widget.start
+          ? widget.start
+          : widget.end
+          ? Moment(widget.end)
+              .subtract(widget.period_sec, "seconds")
+              .format("YYYY-MM-DD HH:mm:ss")
+          : Moment()
+              .subtract(widget.period_sec, "seconds")
+              .format("YYYY-MM-DD HH:mm:ss")
+      }' and ${chDefaults.timestamp_header} < '${
+        widget.end ? widget.end : Moment().format("YYYY-MM-DD HH:mm:ss")
+      }'`
     })
   );
 
diff --git a/src/browser/js/jsonrpc.js b/src/browser/js/jsonrpc.js
index 3609ce5..e1d5120 100644
--- a/src/browser/js/jsonrpc.js
+++ b/src/browser/js/jsonrpc.js
@@ -133,6 +133,12 @@ export default class JSONrpc {
           options.params.sqlExpression
         );
         break;
+      case "GetPartialObject":
+        result = s3Explorer.getPartialObject(
+          options.params.bucketName,
+          options.params.objectName
+        );
+        break;
       default:
         result = {};
         break;
diff --git a/src/browser/js/objects/ObjectActions.js b/src/browser/js/objects/ObjectActions.js
index e19f78c..b4d4a85 100644
--- a/src/browser/js/objects/ObjectActions.js
+++ b/src/browser/js/objects/ObjectActions.js
@@ -18,6 +18,7 @@ import React from "react";
 import { connect } from "react-redux";
 import { Dropdown } from "react-bootstrap";
 import ShareObjectModal from "./ShareObjectModal";
+import PreviewObjectModal from "./PreviewObjectModal";
 import DeleteObjectConfirmModal from "./DeleteObjectConfirmModal";
 import * as objectsActions from "./actions";
 import {
@@ -47,6 +48,11 @@ export class ObjectActions extends React.Component {
     const { object, deleteObject } = this.props;
     deleteObject(object.name);
   }
+  showPreview(e) {
+    e.preventDefault();
+    const { object, previewObject } = this.props;
+    previewObject(object);
+  }
   showDeleteConfirmModal(e) {
     e.preventDefault();
     this.setState({ showDeleteConfirmation: true });
@@ -57,11 +63,23 @@ export class ObjectActions extends React.Component {
     });
   }
   render() {
-    const { object, showShareObjectModal, shareObjectName } = this.props;
+    const {
+      object,
+      showShareObjectModal,
+      shareObjectName,
+      showPreviewObjectModal
+    } = this.props;
     return (
       <Dropdown id={`obj-actions-${object.name}`}>
         <Dropdown.Toggle noCaret className="fia-toggle" />
         <Dropdown.Menu>
+          <a
+            href=""
+            className="fiad-action"
+            onClick={this.showPreview.bind(this)}
+          >
+            <i className="fa fa-eye" />
+          </a>
           <a
             href=""
             className="fiad-action"
@@ -80,6 +98,8 @@ export class ObjectActions extends React.Component {
         {showShareObjectModal && shareObjectName === object.name && (
           <ShareObjectModal object={object} />
         )}
+        {showPreviewObjectModal && <PreviewObjectModal object={object} />}
+
         {this.state.showDeleteConfirmation && (
           <DeleteObjectConfirmModal
             deleteObject={this.deleteObject.bind(this)}
@@ -95,6 +115,8 @@ const mapStateToProps = (state, ownProps) => {
   return {
     object: ownProps.object,
     showShareObjectModal: state.objects.shareObject.show,
+    showPreviewObjectModal: state.objects.previewObject.show,
+    showPreviewObjectContent: state.objects.previewObject.content,
     shareObjectName: state.objects.shareObject.object
   };
 };
@@ -103,7 +125,8 @@ const mapDispatchToProps = dispatch => {
   return {
     shareObject: (object, days, hours, minutes) =>
       dispatch(objectsActions.shareObject(object, days, hours, minutes)),
-    deleteObject: object => dispatch(objectsActions.deleteObject(object))
+    deleteObject: object => dispatch(objectsActions.deleteObject(object)),
+    previewObject: object => dispatch(objectsActions.previewObject(object))
   };
 };
 
diff --git a/src/browser/js/objects/PreviewObjectModal.js b/src/browser/js/objects/PreviewObjectModal.js
new file mode 100644
index 0000000..e273824
--- /dev/null
+++ b/src/browser/js/objects/PreviewObjectModal.js
@@ -0,0 +1,61 @@
+/*
+ * Minio Cloud Storage (C) 2018 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from "react";
+import { connect } from "react-redux";
+import { Modal, ModalHeader, ModalBody } from "react-bootstrap";
+import * as objectsActions from "./actions";
+
+const PreviewObjectModal = ({
+  previewObjectDetails: { content, object },
+  hidePreviewObject
+}) => (
+  <Modal
+    show={true}
+    animation={false}
+    onHide={hidePreviewObject}
+    bsSize="large"
+    className="preview-modal"
+  >
+    <ModalHeader>Preview {object.name}</ModalHeader>
+    <ModalBody style={{ wordBreak: "break-word" }}>
+      {content.objContent}
+    </ModalBody>
+    <div className="modal-footer">
+      <button className="btn btn-link" onClick={hidePreviewObject}>
+        Cancel
+      </button>
+    </div>
+  </Modal>
+);
+
+const mapStateToProps = (state, ownProps) => {
+  return {
+    object: ownProps.object,
+    previewObjectDetails: state.objects.previewObject
+  };
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    hidePreviewObject: () => dispatch(objectsActions.hidePreviewObject())
+  };
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PreviewObjectModal);
diff --git a/src/browser/js/objects/actions.js b/src/browser/js/objects/actions.js
index 34deb2a..6311840 100644
--- a/src/browser/js/objects/actions.js
+++ b/src/browser/js/objects/actions.js
@@ -44,6 +44,7 @@ export const SET_SORT_ORDER = "objects/SET_SORT_ORDER";
 export const SET_CURRENT_PREFIX = "objects/SET_CURRENT_PREFIX";
 export const SET_PREFIX_WRITABLE = "objects/SET_PREFIX_WRITABLE";
 export const SET_SHARE_OBJECT = "objects/SET_SHARE_OBJECT";
+export const SET_PREVIEW_OBJECT = "objects/SET_PREVIEW_OBJECT";
 export const CHECKED_LIST_ADD = "objects/CHECKED_LIST_ADD";
 export const CHECKED_LIST_REMOVE = "objects/CHECKED_LIST_REMOVE";
 export const CHECKED_LIST_RESET = "objects/CHECKED_LIST_RESET";
@@ -416,6 +417,31 @@ export const deleteCheckedObjects = () => {
   };
 };
 
+export const previewObject = object => {
+  return function(dispatch, getState) {
+    const currentBucket = getCurrentBucket(getState());
+    const currentPrefix = getCurrentPrefix(getState());
+    const objectName = `${currentPrefix}${object.name}`;
+    console.log("Preview object", objectName);
+    return web
+      .GetPartialObject({
+        bucketName: currentBucket,
+        objectName: objectName
+      })
+      .then(objContent => {
+        dispatch(showPreviewObject(object, objContent));
+      })
+      .catch(err => {
+        dispatch(
+          alertActions.set({
+            type: "danger",
+            message: err.message
+          })
+        );
+      });
+  };
+};
+
 export const shareObject = (object, days, hours, minutes) => {
   return function(dispatch, getState) {
     const currentBucket = getCurrentBucket(getState());
@@ -449,6 +475,20 @@ export const shareObject = (object, days, hours, minutes) => {
   };
 };
 
+export const showPreviewObject = (object, content) => ({
+  type: SET_PREVIEW_OBJECT,
+  object: object,
+  content: content,
+  show: true
+});
+
+export const hidePreviewObject = (object, content) => ({
+  type: SET_PREVIEW_OBJECT,
+  object: object,
+  content: content,
+  show: false
+});
+
 export const showShareObject = (object, url) => ({
   type: SET_SHARE_OBJECT,
   show: true,
diff --git a/src/browser/js/objects/reducer.js b/src/browser/js/objects/reducer.js
index 335cf1c..61853d1 100644
--- a/src/browser/js/objects/reducer.js
+++ b/src/browser/js/objects/reducer.js
@@ -61,6 +61,10 @@ export default (
       object: "",
       url: ""
     },
+    previewObject: {
+      show: false,
+      content: ""
+    },
     files: {},
     showAbortModal: false,
     checkedList: []
@@ -127,6 +131,15 @@ export default (
           url: action.url
         }
       };
+    case actionsObjects.SET_PREVIEW_OBJECT:
+      return {
+        ...state,
+        previewObject: {
+          show: action.show,
+          object: action.object,
+          content: action.content
+        }
+      };
     case actionsObjects.CHECKED_LIST_ADD:
       return {
         ...state,
diff --git a/src/browser/js/web.js b/src/browser/js/web.js
index a412404..6dffa13 100644
--- a/src/browser/js/web.js
+++ b/src/browser/js/web.js
@@ -176,6 +176,10 @@ class Web {
   getWidgetQueryResult(args) {
     return this.makeCall("GetWidgetQueryResult", args);
   }
+
+  GetPartialObject(args) {
+    return this.makeCall("GetPartialObject", args);
+  }
 }
 
 const web = new Web();
diff --git a/src/browser/less/inc/form.less b/src/browser/less/inc/form.less
index b264ecc..9bc212e 100644
--- a/src/browser/less/inc/form.less
+++ b/src/browser/less/inc/form.less
@@ -171,6 +171,7 @@ select.form-control {
         position: absolute;
         left: 2px;
         top: 8px;
+        color: @sidebar-search;
     }
 
     .ig-text {
diff --git a/src/browser/less/inc/object.less b/src/browser/less/inc/object.less
new file mode 100644
index 0000000..685b269
--- /dev/null
+++ b/src/browser/less/inc/object.less
@@ -0,0 +1,6 @@
+.preview-modal {
+  .modal-content {
+    height: 80vh;
+    overflow-y: scroll;
+  }
+}
diff --git a/src/browser/less/inc/sidebar.less b/src/browser/less/inc/sidebar.less
index 5e8388d..3ffccf6 100644
--- a/src/browser/less/inc/sidebar.less
+++ b/src/browser/less/inc/sidebar.less
@@ -29,11 +29,17 @@
 	.version-text {
 		display: inline-block;
     text-align: left;
-    margin-left: 3.5em;
+		margin-left: 4.1em;
+		margin-top:-2px;
     width: 100%;
-    font-size: 13px;
+		font-size: 11px;
+		color:@sidebar-search;
   }
 
+	.ig-text::placeholder{
+		color: @sidebar-search;
+	}
+
 	a {
 		color: rgba(255, 255, 255, 0.58);
 
@@ -106,7 +112,7 @@
 		}
 
 		&.active {
-			background-color: #282e32;
+			background-color: rgba(0, 0, 0, 0.2);
 
 			& > a {
 				color: @white;
diff --git a/src/browser/less/inc/variables.less b/src/browser/less/inc/variables.less
index ff00a0b..407f4da 100644
--- a/src/browser/less/inc/variables.less
+++ b/src/browser/less/inc/variables.less
@@ -16,11 +16,54 @@
 @brand-info : @blue;
 @navbar-default-link-color : @text-color;
 @border-color: #ededed;
+@sidebar-search: rgba(255,255,255,0.40);
 
 /*--------------------------
     Frontend Customizations
 ----------------------------*/
 
+.widget-kpi{
+  font-size:300%;
+  text-align:center;
+  margin-top:-10px;
+}
+
+.widget-table{
+  overflow-y:auto;
+  width:100%;
+}
+
+.widget-table-head{
+  position: -webkit-sticky;
+  position: sticky;
+  top: 0;
+  background-color:white;
+}
+
+.widget-table::-webkit-scrollbar {
+  width: 10px;
+}
+
+.widget-table::-webkit-scrollbar-track {
+  background:@border-color; 
+}
+ 
+.widget-table::-webkit-scrollbar-thumb {
+  background: darken(@border-color,10%) ; 
+}
+
+.widget-table::-webkit-scrollbar-thumb:hover {
+  background: darken(@border-color,20%); 
+}
+
+.widget-no-data{
+  font-size:80%;
+  font-style: italic;
+}
+
+.widget-title{
+  white-space: nowrap;
+}
 
 .required{
   display:none !important;
@@ -427,6 +470,8 @@ fieldset {
 .navbar-nav > li > a {
   padding-top: 10px;
   padding-bottom: 12px;
+  padding-left:10px;
+  padding-right:10px;
 }
 
 .navbar-nav > li > a:hover{
@@ -510,7 +555,7 @@ fieldset {
 @teal : #009688;
 @brown : #795548;
 @blue-gray : #374952;
-@dark-gray : #32393F;
+@dark-gray : #00303F; //#32393F;
 
 /*--------------------------
     Dropdown
diff --git a/src/browser/less/main.less b/src/browser/less/main.less
index 7d34721..3cfab62 100644
--- a/src/browser/less/main.less
+++ b/src/browser/less/main.less
@@ -42,6 +42,7 @@
 @import "inc/file-explorer";
 @import "inc/ie-warning";
 @import "inc/editor";
+@import "inc/object";
 
 /*----------------------------
     Boostrap
diff --git a/src/browser/schema/server_schema-03.01.json b/src/browser/schema/server_schema-03.01.json
new file mode 100644
index 0000000..82f87ea
--- /dev/null
+++ b/src/browser/schema/server_schema-03.01.json
@@ -0,0 +1,322 @@
+{
+  "type": "object",
+  "properties": {
+    "devicemeta": {
+      "title": "Device meta data",
+      "type": "object",
+      "properties": {
+        "display": {
+          "title": "Meta data header in device folders",
+          "type": "integer",
+          "default": 1,
+          "anyOf": [
+            {
+              "type": "integer",
+              "title": "Disable meta header",
+              "enum": [
+                0
+              ]
+            },
+            {
+              "type": "integer",
+              "title": "Enable meta header",
+              "enum": [
+                1
+              ]
+            }
+          ]
+        },
+        "devices": {
+          "title": "Devices",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "serialno": {
+                "title": "serialno",
+                "type": "string",
+                "pattern": "^[a-fA-F0-9]{8}$",
+                "minLength": 8,
+                "maxLength": 8
+              },
+              "name": {
+                "title": "Name",
+                "type": "string",
+                "pattern": "^.*$",
+                "minLength": 0,
+                "maxLength": 16
+              },
+              "group": {
+                "title": "Group",
+                "type": "string",
+                "pattern": "^.*$",
+                "minLength": 0,
+                "maxLength": 16
+              },
+              "subgroup": {
+                "title": "Subgroup",
+                "type": "string",
+                "pattern": "^.*$",
+                "minLength": 0,
+                "maxLength": 16
+              },
+              "comment": {
+                "title": "Comment",
+                "type": "string",
+                "pattern": "^.*$",
+                "minLength": 0,
+                "maxLength": 64
+              },
+              "imageurl": {
+                "title": "Image Name/URL",
+                "type": "string",
+                "pattern": "^.*$",
+                "minLength": 0,
+                "maxLength": 400
+              }
+            },
+            "additionalProperties": false
+          },
+          "description": "Add device serialno & meta data. Images can be URLs or refer to object names of images uploaded to the server folder (.png, .jpg, .svg). Meta data is used in the left menu, search bar and in the device folder header"
+        },
+        "other": {
+          "title": " ",
+          "type": "object",
+          "properties": {
+            "pending": {
+              "title": " ",
+              "type": "object",
+              "properties": {
+                "tbd": {}
+              }
+            }
+          }
+        }
+      }
+    },
+    "dashboard": {
+      "title": "Dashboard",
+      "description": "Create your own dashboard with customizable widgets. Note that you will need to set up a backend process to provide the data in CSV form for use in the widgets",
+      "type": "object",
+      "properties": {
+        "default_settings": {
+          "title": "Default widget settings",
+          "description": "Specify default settings for use across widgets",
+          "type": "object",
+          "properties": {
+            "timestamp_header": {
+              "title": "Timestamp header",
+              "description": "Header name of column containing timestamps",
+              "type": "string",
+              "pattern": "^(?!time$)(?!timestamp$)[a-zA-Z0-9_-]*$",
+              "default": "timestamps",
+              "minLength": 3,
+              "maxLength": 30
+            },
+            "segment_header": {
+              "title": "Segment header",
+              "description": "Header name of column containing segment names (e.g. device serial numbers)",
+              "type": "string",
+              "pattern": "^[a-zA-Z0-9_-]*$",
+              "default": "segments",
+              "minLength": 3,
+              "maxLength": 30
+            },
+            "chart_colors": {
+              "title": "Chart colors",
+              "description": "This prioritized list of HEX color codes serves as the default set of colors for use in charts",
+              "type": "string",
+              "pattern": "^(((0x){0,1}|#{0,1})([0-9A-Fa-f]{8}|[0-9A-Fa-f]{6})(\\s?))+$",
+              "default": "#3d85c6 #ff9900 #073763 #0b5394 #6fa8dc #9fc5e8 #e69138 #f6b26b #f9cb9c"
+            },
+            "line_border_width": {
+              "title": "Line chart width",
+              "description": "Width of line chart lines",
+              "type": "integer",
+              "default": 2,
+              "minimum": 1,
+              "maximum": 10
+            },
+            "point_radius": {
+              "title": "Point radius",
+              "description": "Radius of line chart points",
+              "type": "integer",
+              "default": 0,
+              "minimum": 0,
+              "maximum": 10
+            },
+            "chart_font_size": {
+              "title": "Chart font size",
+              "description": "Font size of charts",
+              "type": "integer",
+              "default": 8,
+              "minimum": 4,
+              "maximum": 20
+            },
+            "table_font_size": {
+              "title": "Table font size",
+              "description": "Font size of tables",
+              "type": "integer",
+              "default": 11,
+              "minimum": 4,
+              "maximum": 20
+            },
+            "legend_labels_box_width": {
+              "title": "Legend box width",
+              "description": "Width of legend boxes - larger width makes the boxes wider",
+              "type": "integer",
+              "default": 10,
+              "minimum": 0,
+              "maximum": 20
+            },
+            "legend_labels_padding": {
+              "title": "Legend box padding",
+              "description": "Padding of legend boxes - larger padding puts the labels further apart",
+              "type": "integer",
+              "default": 4,
+              "minimum": 0,
+              "maximum": 20
+            }
+          },
+          "required": [
+            "timestamp_header",
+            "segment_header",
+            "chart_colors",
+            "line_border_width",
+            "point_radius",
+            "chart_font_size",
+            "table_font_size",
+            "legend_labels_box_width",
+            "legend_labels_padding"
+          ]
+        },
+        "widgets": {
+          "type": "array",
+          "title": "Widgets",
+          "description": "Add custom widgets incl. charts, KPIs, tables & maps",
+          "items": {
+            "type": "object",
+            "properties": {
+              "title": {
+                "title": "Widget title",
+                "description": "Title displayed at top of widget",
+                "type": "string",
+                "default": "[Widget title]",
+                "minLength": 1,
+                "maxLength": 100
+              },
+              "widget_type": {
+                "title": "Widget type",
+                "description": "The widget type controls the type of widget displayed. Note that the dataset structure differs across some widget types",
+                "type": "string",
+                "default": "line",
+                "enum": [
+                  "line",
+                  "pie",
+                  "bar",
+                  "horizontal-bar",
+                  "kpi",
+                  "table",
+                  "map"
+                ]
+              },
+              "data_file_name": {
+                "title": "Data file name",
+                "description": "Path or file name of *.csv containing data for use in the widget. The file must be available in this S3 server bucket. Example: 'server/timeseries.csv' or 'pie.csv'",
+                "type": "string",
+                "default": "data.csv",
+                "pattern": "^[A-Za-z0-9-/]+.(csv|CSV)$",
+                "minLength": 5,
+                "maxLength": 70
+              },
+              "parameters": {
+                "title": "Data parameters",
+                "description": "Enter the column header names of the parameters to be extracted from the dataset. Multiple parameters can be extracted by separating each name with a space",
+                "type": "string",
+                "default": "ParameterX",
+                "pattern": "^[A-Za-z0-9-_(\\s?)]+$",
+                "minLength": 0,
+                "maxLength": 200
+              },
+              "segments": {
+                "title": "Segments",
+                "description": "Enter the segments to be displayed in the widget by referencing the names (e.g. device serial numbers) from the segments column of your dataset. Example: '11F23D78 AA2F3892'. If left blank, all segments are extracted",
+                "type": "string",
+                "pattern": "^(|[A-Za-z0-9-_(\\s?)]+)$"
+              },
+              "period_sec": {
+                "title": "Period (sec)",
+                "description": "This determines how far back data is extracted vs. the date & time the dashboard is rendered, enabling widgets to update dynamically. Setting this to e.g. 86400 seconds (24 hours) means that data from within the last 24 hours will be displayed (based on the timestamp column in your dataset). If an explicit end time & date is specified, the period will be set against this time. If an explicit start is specified, the period is ignored",
+                "type": "integer",
+                "default": 86400,
+                "minLength": 0
+              },
+              "start": {
+                "title": "Start",
+                "description": "Optionally use this to set a specific start time for the widget data- e.g. for development purposes",
+                "type": "string",
+                "pattern": "^(|[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2})$"
+              },
+              "end": {
+                "title": "End",
+                "description": "Optionally use this to set a specific end time for the widget data - e.g. for development purposes",
+                "type": "string",
+                "pattern": "^(|[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2})$"
+              },
+              "class_name": {
+                "title": "Class names for widget",
+                "description": "Add a CSS class to the widget. In particular, you can use 'col-sm-X' to control how wide the widget should be as a fraction of 12. Example: 'col-sm-4' will make the widget take up one third of the dashboard on desktop resolution",
+                "type": "string",
+                "default": "col-sm-4"
+              },
+              "aspect_ratio": {
+                "title": "Maintain chart aspect ratio",
+                "description": "Control if the aspect ratio should stay fixed or not (only relevant for charts)",
+                "type": "integer",
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "title": "False",
+                    "enum": [
+                      0
+                    ]
+                  },
+                  {
+                    "type": "integer",
+                    "title": "True",
+                    "enum": [
+                      1
+                    ]
+                  }
+                ],
+                "default": 0
+              },
+              "height": {
+                "title": "Widget height",
+                "description": "Control the widget height in pixels. Setting a non-default value may require some testing to get the height to align with other widgets",
+                "type": "integer",
+                "default": 200
+              },
+              "colors": {
+                "title": "Widget specific colors",
+                "description": "This prioritized list of HEX color codes serves as the widget-specific set of colors for use in charts. If left blank, the default color list will be used",
+                "type": "string",
+                "pattern": "^(|(((0x){0,1}|#{0,1})([0-9A-Fa-f]{8}|[0-9A-Fa-f]{6})(\\s?))+)$"
+              }
+            },
+            "required": [
+              "title",
+              "widget_type",
+              "data_file_name",
+              "parameters",
+              "period_sec",
+              "class_name",
+              "aspect_ratio",
+              "height"
+            ]
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/browser/schema/uischema-00.06.json b/src/browser/schema/uischema-00.07.json
similarity index 67%
rename from src/browser/schema/uischema-00.06.json
rename to src/browser/schema/uischema-00.07.json
index b2b3495..14b4673 100644
--- a/src/browser/schema/uischema-00.06.json
+++ b/src/browser/schema/uischema-00.07.json
@@ -4,17 +4,29 @@
       "GENERAL",
       "LOG",
       "RTC",
-      "CONNECT",
       "2ND-PORT",
       "CAN CH1",
       "CAN CH2",
-      "SECURITY",
-      "DEBUG"
+      "LIN CH1",
+      "LIN CH2",
+      "CONNECT"
     ]
   },
   "general": {
     "nav": "GENERAL"
   },
+  "log": {
+    "nav": "LOG",
+    "split_size": {
+      "ui:widget": "updown"
+    },
+    "split_time_period": {
+      "ui:widget": "updown"
+    },
+    "split_time_offset": {
+      "ui:widget": "updown"
+    }
+  },
   "rtc": {
     "nav": "RTC",
     "sync": {},
@@ -43,8 +55,31 @@
       "classNames": "col-sm-4"
     }
   },
+  "secondaryport": {
+    "nav": "2ND-PORT",
+    "power_schedule": {
+      "items": {
+        "from": {
+          "classNames": "col-sm-6",
+          "ui:placeholder": "E.g. 00:00"
+        },
+        "to": {
+          "classNames": "col-sm-6",
+          "ui:placeholder": "E.g. 12:30"
+        }
+      }
+    }
+  },
   "can_1": {
     "nav": "CAN CH1",
+    "general": {
+      "rx_state": {
+        "classNames": "col-sm-6"
+      },
+      "tx_state": {
+        "classNames": "col-sm-6"
+      }
+    },
     "phy": {
       "mode": {},
       "fd_spec": {},
@@ -164,10 +199,77 @@
           "ui:placeholder": "Name"
         }
       }
+    },
+    "heartbeat": {
+      "state": {
+        "classNames": "col-sm-3"
+      },
+      "id_format": {
+        "classNames": "col-sm-3"
+      },
+      "id": {
+        "classNames": "col-sm-3"
+      }
+    },
+    "control": {
+      "control_rx_state": {
+        "classNames": "col-sm-6"
+      },
+      "control_tx_state": {
+        "classNames": "col-sm-6"
+      },
+      "start": {
+        "id_format": {
+          "classNames": "col-sm-4"
+        },
+        "id": {
+          "classNames": "col-sm-4"
+        },
+        "id_mask": {
+          "classNames": "col-sm-4"
+        },
+        "data_mask": {
+          "classNames": "col-sm-4"
+        },
+        "data_high": {
+          "classNames": "col-sm-4"
+        },
+        "data_low": {
+          "classNames": "col-sm-4"
+        }
+      },
+      "stop": {
+        "id_format": {
+          "classNames": "col-sm-4"
+        },
+        "id": {
+          "classNames": "col-sm-4"
+        },
+        "id_mask": {
+          "classNames": "col-sm-4"
+        },
+        "data_mask": {
+          "classNames": "col-sm-4"
+        },
+        "data_high": {
+          "classNames": "col-sm-4"
+        },
+        "data_low": {
+          "classNames": "col-sm-4"
+        }
+      }
     }
   },
   "can_2": {
     "nav": "CAN CH2",
+    "general": {
+      "rx_state": {
+        "classNames": "col-sm-6"
+      },
+      "tx_state": {
+        "classNames": "col-sm-6"
+      }
+    },
     "phy": {
       "mode": {},
       "fd_spec": {},
@@ -287,11 +389,72 @@
           "ui:placeholder": "Name"
         }
       }
+    },
+    "heartbeat": {
+      "state": {
+        "classNames": "col-sm-3"
+      },
+      "id_format": {
+        "classNames": "col-sm-3"
+      },
+      "id": {
+        "classNames": "col-sm-3"
+      }
+    },
+    "control": {
+      "control_rx_state": {
+        "classNames": "col-sm-6"
+      },
+      "control_tx_state": {
+        "classNames": "col-sm-6"
+      },
+      "start": {
+        "id_format": {
+          "classNames": "col-sm-4"
+        },
+        "id": {
+          "classNames": "col-sm-4"
+        },
+        "id_mask": {
+          "classNames": "col-sm-4"
+        },
+        "data_mask": {
+          "classNames": "col-sm-4"
+        },
+        "data_high": {
+          "classNames": "col-sm-4"
+        },
+        "data_low": {
+          "classNames": "col-sm-4"
+        }
+      },
+      "stop": {
+        "id_format": {
+          "classNames": "col-sm-4"
+        },
+        "id": {
+          "classNames": "col-sm-4"
+        },
+        "id_mask": {
+          "classNames": "col-sm-4"
+        },
+        "data_mask": {
+          "classNames": "col-sm-4"
+        },
+        "data_high": {
+          "classNames": "col-sm-4"
+        },
+        "data_low": {
+          "classNames": "col-sm-4"
+        }
+      }
     }
   },
-  "secondaryport": {
-    "nav": "2ND-PORT",
-    "power": {}
+  "lin_1": {
+    "nav": "LIN CH1"
+  },
+  "lin_2": {
+    "nav": "LIN CH2"
   },
   "connect": {
     "nav": "CONNECT",
@@ -355,6 +518,7 @@
           "classNames": "col-sm-3"
         },
         "region": {
+          "ui:placeholder": "E.g. eu-central-1",
           "classNames": "col-sm-3"
         },
         "accesskey": {
@@ -369,18 +533,6 @@
       }
     }
   },
-  "log": {
-    "nav": "LOG",
-    "split_size": {
-      "ui:widget": "updown"
-    },
-    "split_time_period": {
-      "ui:widget": "updown"
-    },
-    "split_time_offset": {
-      "ui:widget": "updown"
-    }
-  },
   "devicemeta": {
     "nav": "DEVICE META",
     "devices": {
@@ -418,13 +570,78 @@
       }
     }
   },
-  "security": {
-    "nav": "SECURITY"
-  },
-  "other": {
-    "nav": "OTHER",
-    "preview": {
-      "ui:widget": "updown"
+  "dashboard": {
+    "nav": "DASHBOARD",
+    "default_settings": {
+      "timestamp_header": {
+        "classNames": "col-sm-4"
+      },
+      "segment_header": {
+        "classNames": "col-sm-4"
+      },
+      "chart_colors": {
+        "classNames": "col-sm-4"
+      },
+      "line_border_width": {
+        "classNames": "col-sm-2"
+      },
+      "point_radius": {
+        "classNames": "col-sm-2"
+      },
+      "chart_font_size": {
+        "classNames": "col-sm-2"
+      },
+      "table_font_size": {
+        "classNames": "col-sm-2"
+      },
+      "legend_labels_box_width": {
+        "classNames": "col-sm-2"
+      },
+      "legend_labels_padding": {
+        "classNames": "col-sm-2"
+      }
+    },
+    "widgets": {
+      "items": {
+        "title": {
+          "classNames": "col-md-12"
+        },
+        "widget_type": {
+          "classNames": "col-md-3"
+        },
+        "data_file_name": {
+          "classNames": "col-md-3"
+        },
+        "parameters": {
+          "classNames": "col-md-3"
+        },
+        "segments": {
+          "classNames": "col-md-3"
+        },
+        "period_sec": {
+          "classNames": "col-md-4"
+        },
+        "start": {
+          "ui:placeholder:": "YYYY-MM-DD-HH:MM:SS",
+          "classNames": "col-md-4"
+        },
+        "end": {
+          "ui:placeholder:": "YYYY-MM-DD-HH:MM:SS",
+          "classNames": "col-md-4"
+        },
+        "class_name": {
+          "classNames": "col-md-3"
+        },
+        "aspect_ratio": {
+          "classNames": "col-md-3"
+        },
+        "height": {
+          "classNames": "col-md-3"
+        },
+        "colors": {
+          "classNames": "col-md-3"
+        }
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/src/sdk/aws-sdk-client.js b/src/sdk/aws-sdk-client.js
index 019b807..d184e51 100644
--- a/src/sdk/aws-sdk-client.js
+++ b/src/sdk/aws-sdk-client.js
@@ -1,10 +1,12 @@
 import AWS from "aws-sdk";
 
 class AwsSdk {
-  constructor(accessKeyId, secretAccessKey) {
+  constructor(accessKeyId, secretAccessKey, endpoint) {
     this.aws3 = new AWS.S3({
       accessKeyId,
-      secretAccessKey
+      secretAccessKey,
+      endpoint,
+      s3ForcePathStyle: true
     });
   }
 
@@ -20,11 +22,7 @@ class AwsSdk {
             if (event.Records) {
               result = result.concat(event.Records.Payload.toString());
             } else if (event.Stats) {
-              console.log(
-                `Processed ${event.Stats.Details.BytesProcessed} bytes`
-              );
             } else if (event.End) {
-              console.log("SelectObjectContent completed");
               resolve(result);
             }
           }
diff --git a/src/sdk/s3explorer.js b/src/sdk/s3explorer.js
index 6fdff32..ca91b5c 100644
--- a/src/sdk/s3explorer.js
+++ b/src/sdk/s3explorer.js
@@ -34,7 +34,7 @@ class S3Explorer {
       this.bucketName = options.bucketName;
     }
 
-    this.AwsSdk = new AwsSdk(this.accessKey, this.secretKey);
+    this.AwsSdk = new AwsSdk(this.accessKey, this.secretKey, this.endPoint);
   }
 
   /**
@@ -436,7 +436,6 @@ class S3Explorer {
    */
 
   getWidgetQueryResult(dataFileName, sqlExpression, cb) {
-    console.log(sqlExpression);
     const params = {
       Bucket: this.bucketName,
       Key: dataFileName,
@@ -476,13 +475,56 @@ class S3Explorer {
           dataset,
           records
         });
+
         return cb(null, response);
       })
       .catch(err => {
         console.log("err", err);
+        console.log("Attempted SQL expression:", sqlExpression);
         return cb(err);
       });
   }
+
+  /**
+   * @name: getPartialObject
+   * @description: Get object content based on the pre-defined range i.e 10kb
+   */
+
+  getPartialObject(bucketName, objectName, cb) {
+    let objectNameWithPrefix;
+    if ("Home" == bucketName) {
+      objectNameWithPrefix = objectName;
+    } else {
+      objectNameWithPrefix = bucketName + "/" + objectName;
+    }
+    let partialContent = "";
+    this.s3Client.getPartialObject(
+      this.bucketName,
+      objectNameWithPrefix,
+      0,
+      10000,
+      (err, stream) => {
+        if (err) {
+          console.log(err);
+          return cb(err);
+        }
+        stream.on("data", function(chunk) {
+          partialContent += chunk.toString();
+        });
+        stream.on("end", function() {
+          const response = StorageResponses.makeDefaultResponse(
+            "objContent",
+            partialContent
+          );
+          return cb(null, response);
+        });
+        stream.on("error", function(err) {
+          console.log(err);
+          return cb(err);
+        });
+      }
+    );
+  }
 }
 
 S3Explorer.prototype.getSessionsObject = promisify(
@@ -532,4 +574,8 @@ S3Explorer.prototype.getWidgetQueryResult = promisify(
   S3Explorer.prototype.getWidgetQueryResult
 );
 
+S3Explorer.prototype.getPartialObject = promisify(
+  S3Explorer.prototype.getPartialObject
+);
+
 module.exports = S3Explorer;