diff --git a/new-lamassu-admin/src/components/tables/DataTable.js b/new-lamassu-admin/src/components/tables/DataTable.js
index 099ade01..63d0d6f7 100644
--- a/new-lamassu-admin/src/components/tables/DataTable.js
+++ b/new-lamassu-admin/src/components/tables/DataTable.js
@@ -81,7 +81,7 @@ const Row = ({
           )}
         </Tr>
       </div>
-      {expandable && expanded && (
+      {expanded && (
         <div className={classes.after}>
           <Tr className={classnames({ [classes.expanded]: expanded })}>
             <Td width={width}>
@@ -99,6 +99,7 @@ const DataTable = ({
   data = [],
   Details,
   className,
+  tableClassName,
   expandable,
   initialExpanded,
   onClick,
@@ -169,7 +170,7 @@ const DataTable = ({
 
   return (
     <Box display="flex" flex="1" flexDirection="column">
-      <Table className={classes.table}>
+      <Table className={classnames(classes.table, tableClassName)}>
         <THead>
           {elements.map(({ width, className, textAlign, header }, idx) => (
             <Th
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
index d14db761..494ac7e7 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
@@ -3,92 +3,17 @@ import { makeStyles } from '@material-ui/core'
 import gql from 'graphql-tag'
 import * as R from 'ramda'
 import React, { useState } from 'react'
-import * as Yup from 'yup'
 
-import { IconButton } from 'src/components/buttons'
-import { Table as EditableTable } from 'src/components/editableTable'
-import { CashOut, CashIn } from 'src/components/inputs/cashbox/Cashbox'
-import { NumberInput, CashCassetteInput } from 'src/components/inputs/formik'
+import DataTable from 'src/components/tables/DataTable'
+import CashUnitDetails from 'src/pages/Maintenance/CashUnitDetails'
 import Wizard from 'src/pages/Maintenance/Wizard/Wizard'
-import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
+import helper from 'src/pages/Maintenance/helper'
 import { fromNamespace } from 'src/utils/config'
 
 import styles from './Cassettes.styles'
 
 const useStyles = makeStyles(styles)
 
-const widthsByNumberOfCassettes = {
-  2: { cashbox: 203, cassette: 280, cassetteGraph: 80, editWidth: 87 },
-  3: { cashbox: 164, cassette: 200, cassetteGraph: 60, editWidth: 87 },
-  4: { cashbox: 131, cassette: 158, cassetteGraph: 40, editWidth: 87 }
-}
-
-const ValidationSchema = Yup.object().shape({
-  name: Yup.string().required('Required'),
-  cashbox: Yup.number()
-    .label('Cash box')
-    .required()
-    .integer()
-    .min(0)
-    .max(1000),
-  cassette1: Yup.number()
-    .required('Required')
-    .integer()
-    .min(0)
-    .max(500),
-  cassette2: Yup.number()
-    .required('Required')
-    .integer()
-    .min(0)
-    .max(500),
-  cassette3: Yup.number()
-    .required('Required')
-    .integer()
-    .min(0)
-    .max(500),
-  cassette4: Yup.number()
-    .required('Required')
-    .integer()
-    .min(0)
-    .max(500),
-  stacker1f: Yup.number()
-    .label('Stacker 1F')
-    .required('Required')
-    .integer()
-    .min(0)
-    .max(40),
-  stacker1r: Yup.number()
-    .label('Stacker 1R')
-    .required('Required')
-    .integer()
-    .min(0)
-    .max(60),
-  stacker2f: Yup.number()
-    .label('Stacker 2F')
-    .required('Required')
-    .integer()
-    .min(0)
-    .max(60),
-  stacker2r: Yup.number()
-    .label('Stacker 2R')
-    .required('Required')
-    .integer()
-    .min(0)
-    .max(60),
-  stacker3f: Yup.number()
-    .label('Stacker 3F')
-    .required('Required')
-    .integer()
-    .min(0)
-    .max(60),
-  stacker3r: Yup.number()
-    .label('Stacker 3R')
-    .required('Required')
-    .integer()
-    .min(0)
-    .max(60)
-})
-
 const SET_CASSETTE_BILLS = gql`
   mutation MachineAction(
     $deviceId: ID!
@@ -114,6 +39,13 @@ const SET_CASSETTE_BILLS = gql`
   }
 `
 
+const widths = {
+  name: 0,
+  cashbox: 175,
+  cassettes: 585,
+  edit: 90
+}
+
 const CashCassettes = ({ machine, config, refetchData, bills }) => {
   const classes = useStyles()
 
@@ -121,89 +53,14 @@ const CashCassettes = ({ machine, config, refetchData, bills }) => {
 
   const cashout = config && fromNamespace('cashOut')(config)
   const locale = config && fromNamespace('locale')(config)
-  const fillingPercentageSettings =
-    config && fromNamespace('notifications', config)
   const fiatCurrency = locale?.fiatCurrency
-  const numberOfCassettes = machine.numberOfCassettes
 
   const getCashoutSettings = deviceId => fromNamespace(deviceId)(cashout)
-  const isCashOutDisabled = ({ deviceId }) =>
-    !getCashoutSettings(deviceId).active
 
-  const elements = [
-    {
-      name: 'cashbox',
-      header: 'Cash box',
-      width: widthsByNumberOfCassettes[numberOfCassettes].cashbox,
-      stripe: false,
-      view: value => (
-        <CashIn
-          currency={{ code: fiatCurrency }}
-          notes={value}
-          total={R.sum(R.map(it => it.fiat)(bills))}
-        />
-      ),
-      input: NumberInput,
-      inputProps: {
-        decimalPlaces: 0
-      }
-    }
-  ]
-
-  R.until(
-    R.gt(R.__, numberOfCassettes),
-    it => {
-      elements.push({
-        name: `cassette${it}`,
-        header: `Cash cassette ${it}`,
-        width: widthsByNumberOfCassettes[numberOfCassettes].cassette,
-        stripe: true,
-        doubleHeader: 'Cash-out',
-        view: value => {
-          return (
-            <CashOut
-              className={classes.cashbox}
-              denomination={
-                getCashoutSettings(machine.deviceId)?.[`cassette${it}`]
-              }
-              currency={{ code: fiatCurrency }}
-              notes={value}
-              width={widthsByNumberOfCassettes[numberOfCassettes].cassetteGraph}
-              threshold={
-                fillingPercentageSettings[`fillingPercentageCassette${it}`]
-              }
-            />
-          )
-        },
-        isHidden: ({ numberOfCassettes }) => it > numberOfCassettes,
-        input: CashCassetteInput,
-        inputProps: {
-          decimalPlaces: 0,
-          width: widthsByNumberOfCassettes[numberOfCassettes].cassetteGraph,
-          inputClassName: classes.cashbox
-        }
-      })
-      return R.add(1, it)
-    },
-    1
+  const elements = R.filter(it => it.name !== 'name')(
+    helper.getElements(classes, config, bills, setWizard, widths)
   )
 
-  elements.push({
-    name: 'edit',
-    header: 'Edit',
-    width: widthsByNumberOfCassettes[numberOfCassettes].editWidth,
-    view: () => {
-      return (
-        <IconButton
-          onClick={() => {
-            setWizard(true)
-          }}>
-          <EditIcon />
-        </IconButton>
-      )
-    }
-  })
-
   const [setCassetteBills, { error }] = useMutation(SET_CASSETTE_BILLS, {
     refetchQueries: () => refetchData()
   })
@@ -218,18 +75,26 @@ const CashCassettes = ({ machine, config, refetchData, bills }) => {
       }
     })
 
+  const InnerCashUnitDetails = ({ it }) => (
+    <CashUnitDetails
+      machine={it}
+      bills={bills[it.id] ?? []}
+      currency={fiatCurrency}
+      config={config}
+      hideMachineData
+      widths
+    />
+  )
+
   return machine.name ? (
     <>
-      <EditableTable
-        error={error?.message}
-        editWidth={widthsByNumberOfCassettes[numberOfCassettes].editWidth}
-        stripeWhen={isCashOutDisabled}
-        disableRowEdit={isCashOutDisabled}
-        name="cashboxes"
+      <DataTable
         elements={elements}
         data={[machine]}
-        save={onSave}
-        validationSchema={ValidationSchema}
+        Details={InnerCashUnitDetails}
+        emptyText="No machines so far"
+        initialExpanded={0}
+        tableClassName={classes.dataTable}
       />
       {wizard && (
         <Wizard
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.styles.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.styles.js
index db8c77aa..ec245a0a 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.styles.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.styles.js
@@ -1,6 +1,34 @@
+import { offDarkColor } from 'src/styling/variables'
+
 const styles = {
-  cashbox: {
-    height: 36
+  unitsRow: {
+    display: 'flex',
+    flexDirection: 'row',
+    margin: [[10, 0]],
+    '& > *': {
+      marginRight: 30
+    },
+    '& > *:last-child': {
+      marginRight: 0
+    }
+  },
+  units: {
+    display: 'flex',
+    flexDirection: 'row',
+    '& > *': {
+      marginRight: 10
+    },
+    '& > *:last-child': {
+      marginRight: 0
+    }
+  },
+  verticalLine: {
+    height: '100%',
+    width: 1,
+    backgroundColor: offDarkColor
+  },
+  dataTable: {
+    minHeight: 290
   }
 }
 
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.js b/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.js
index 6bd69372..3aea6984 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.js
@@ -36,10 +36,10 @@ const styles = {
     flexDirection: 'column',
     minWidth: 210
   },
-  billList: {
+  billList: ({ hideMachineData }) => ({
     display: 'flex',
     flexDirection: 'column',
-    minWidth: 160,
+    minWidth: hideMachineData ? 80 : 160,
     '& > span': {
       display: 'flex',
       flexDirection: 'row',
@@ -48,7 +48,7 @@ const styles = {
         minWidth: 30
       }
     }
-  },
+  }),
   unitList: {
     display: 'flex',
     flexDirection: 'row',
@@ -82,8 +82,14 @@ const styles = {
 
 const useStyles = makeStyles(styles)
 
-const CashUnitDetails = ({ machine, bills, currency, config }) => {
-  const classes = useStyles()
+const CashUnitDetails = ({
+  machine,
+  bills,
+  currency,
+  config,
+  hideMachineData = false
+}) => {
+  const classes = useStyles({ hideMachineData })
   const billCount = R.countBy(it => it.fiat)(bills)
   const fillingPercentageSettings = fromNamespace('notifications', config)
   const cashout = fromNamespace('cashOut')(config)
@@ -91,10 +97,12 @@ const CashUnitDetails = ({ machine, bills, currency, config }) => {
 
   return (
     <div className={classes.wrapper}>
-      <div className={classes.machineData}>
-        <Label1>Machine Model</Label1>
-        <span>{modelPrettifier[machine.model]}</span>
-      </div>
+      {!hideMachineData && (
+        <div className={classes.machineData}>
+          <Label1>Machine Model</Label1>
+          <span>{modelPrettifier[machine.model]}</span>
+        </div>
+      )}
       <div className={classes.billList}>
         <Label1>Cash box</Label1>
         {R.isEmpty(billCount) && <TL2 noMargin>Empty</TL2>}
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnits.js b/new-lamassu-admin/src/pages/Maintenance/CashUnits.js
index 212af940..2572476a 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnits.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnits.js
@@ -101,6 +101,13 @@ const GET_BATCHES_CSV = gql`
   }
 `
 
+const widths = {
+  name: 250,
+  cashbox: 200,
+  cassettes: 575,
+  edit: 90
+}
+
 const CashCassettes = () => {
   const classes = useStyles()
   const [showHistory, setShowHistory] = useState(false)
@@ -176,12 +183,12 @@ const CashCassettes = () => {
   }
 
   const elements = helper.getElements(
-    machines,
     classes,
     config,
     bills,
-    setMachineId,
-    setWizard
+    setWizard,
+    widths,
+    setMachineId
   )
 
   const InnerCashUnitDetails = ({ it }) => (
diff --git a/new-lamassu-admin/src/pages/Maintenance/helper.js b/new-lamassu-admin/src/pages/Maintenance/helper.js
index c37769be..fa3c1e0e 100644
--- a/new-lamassu-admin/src/pages/Maintenance/helper.js
+++ b/new-lamassu-admin/src/pages/Maintenance/helper.js
@@ -7,12 +7,12 @@ import { fromNamespace } from 'src/utils/config'
 import { cashUnitCapacity } from 'src/utils/machine'
 
 const getElements = (
-  machines,
   classes,
   config,
   bills,
-  setMachineId,
-  setWizard
+  setWizard,
+  widths,
+  setMachineId
 ) => {
   const fillingPercentageSettings = fromNamespace('notifications', config)
   const locale = fromNamespace('locale')(config)
@@ -25,14 +25,14 @@ const getElements = (
     {
       name: 'name',
       header: 'Machine',
-      width: 250,
+      width: widths.name,
       view: m => <>{m.name}</>,
       input: ({ field: { value: name } }) => <>{name}</>
     },
     {
       name: 'cashbox',
       header: 'Cashbox',
-      width: 200,
+      width: widths.cashbox,
       view: m => (
         <CashIn
           currency={{ code: fiatCurrency }}
@@ -51,7 +51,7 @@ const getElements = (
     {
       name: 'cassettes',
       header: 'Cassettes & Recyclers',
-      width: 575,
+      width: widths.cassettes,
       view: m => {
         return (
           <div className={classes.unitsRow}>
@@ -112,13 +112,13 @@ const getElements = (
     {
       name: 'edit',
       header: 'Edit',
-      width: 90,
+      width: widths.edit,
       textAlign: 'center',
       view: m => {
         return (
           <IconButton
             onClick={() => {
-              setMachineId(m.id)
+              !R.isNil(setMachineId) && setMachineId(m.id)
               setWizard(true)
             }}>
             <EditIcon />