diff --git a/src/device/ArcGISDeviceData.tsx b/src/device/ArcGISDeviceData.tsx
index c12c53b..3a2a518 100644
--- a/src/device/ArcGISDeviceData.tsx
+++ b/src/device/ArcGISDeviceData.tsx
@@ -78,7 +78,7 @@ export default function ArcGISDeviceData(props: Props) {
 
   const getMeasurements = () => {
     if (useFlat) {
-      deviceAPI.listSimpleJSON(device.id()).then(resp => {
+      deviceAPI.listSimpleJSON(device.id(), as).then(resp => {
         downloadJSON(resp.data, "Device" + device.id() + ".json");
       });
     } else {
diff --git a/src/device/DeviceViewer.tsx b/src/device/DeviceViewer.tsx
index 52c9693..e03dae3 100644
--- a/src/device/DeviceViewer.tsx
+++ b/src/device/DeviceViewer.tsx
@@ -360,12 +360,21 @@ export default function Device(props: Props) {
   // } else {
     return (
       <Box padding={1}>
-        <Grid container direction="row" alignItems="center">
-          <Grid style={{ order: 5 }}>
+        <Grid container direction="row" justifyContent="space-between" alignItems="center" width="100%">
+        <Grid size={12}>
+            <DeviceOverview
+              device={device}
+              components={[...components.values()]}
+              usage={getUsage()}
+              loading={isLoading}
+              />
+          </Grid>
+          <Grid size={12}>
             <DeviceActions
               device={device}
               isPaused={isPaused()}
-              components={getOrderedComponents()}
+              components={[...components.values()]}
+              //components={getOrderedComponents()}
               interactions={interactions}
               availablePositions={availablePositions}
               availableOffsets={availableOffsets}
@@ -374,18 +383,10 @@ export default function Device(props: Props) {
               preferences={preferences}
               toggleNotificationPreference={toggleNotificationPreference}
               isLoading={isLoading}
-            />
-          </Grid>
-          <Grid style={{ order: 4 }}>
-            <DeviceOverview
-              device={device}
-              components={[...components.values()]}
-              usage={getUsage()}
-              loading={isLoading}
-            />
+              />
           </Grid>
+          {componentsTab()} 
         </Grid>
-        {componentsTab()}
       </Box>
     );
   //}
diff --git a/src/providers/pond/deviceAPI.tsx b/src/providers/pond/deviceAPI.tsx
index 84c8dbc..201df88 100644
--- a/src/providers/pond/deviceAPI.tsx
+++ b/src/providers/pond/deviceAPI.tsx
@@ -131,7 +131,7 @@ export interface IDeviceAPIContext {
     orderBy: string,
     as?: string
   ) => Promise<AxiosResponse<pond.ListDeviceExportedMeasurementsResponse>>;
-  listSimpleJSON: (device: number) => Promise<any>;
+  listSimpleJSON: (device: number, as?: string) => Promise<any>;
   resetQuackCount: (id: number) => Promise<any>;
   resetQuackCountTx: (id: number) => Promise<any>;
   resetQuackCountTx1000: (id: number) => Promise<any>;
@@ -832,9 +832,11 @@ export default function DeviceProvider(props: PropsWithChildren<Props>) {
     );
   };
 
-  const listSimpleJSON = (device: number) => {
+  const listSimpleJSON = (device: number, as?: string) => {
+    let url = "/devices/" + device + "/measurements/exportSimple"
+    if(as) url = url + "?as=" + as
     return new Promise<AxiosResponse>((resolve, reject) => {
-      get(pondURL("/devices/" + device + "/measurements/exportSimple")).then(resp => {
+      get(pondURL(url)).then(resp => {
         return resolve(resp)
       }).catch(err => {
         return reject(err)