diff --git a/new-lamassu-admin/src/components/table/EmptyTable.js b/new-lamassu-admin/src/components/table/EmptyTable.js
index 270bbc7b..a7d991de 100644
--- a/new-lamassu-admin/src/components/table/EmptyTable.js
+++ b/new-lamassu-admin/src/components/table/EmptyTable.js
@@ -1,4 +1,5 @@
 import { makeStyles } from '@material-ui/core'
+import classNames from 'classnames'
 import React, { memo } from 'react'
 
 import { H4 } from 'src/components/typography'
@@ -16,11 +17,11 @@ const styles = {
 
 const useStyles = makeStyles(styles)
 
-const EmptyTable = memo(({ message }) => {
+const EmptyTable = memo(({ message, className }) => {
   const classes = useStyles()
 
   return (
-    <div className={classes.emptyTable}>
+    <div className={classNames(className, classes.emptyTable)}>
       <EmptyTableIcon />
       <H4>{message}</H4>
     </div>
diff --git a/new-lamassu-admin/src/pages/Dashboard/Dashboard.js b/new-lamassu-admin/src/pages/Dashboard/Dashboard.js
index 5d4997de..d446593c 100644
--- a/new-lamassu-admin/src/pages/Dashboard/Dashboard.js
+++ b/new-lamassu-admin/src/pages/Dashboard/Dashboard.js
@@ -1,9 +1,16 @@
+import { useQuery } from '@apollo/react-hooks'
 import Grid from '@material-ui/core/Grid'
 import { makeStyles } from '@material-ui/core/styles'
 import classnames from 'classnames'
-import React from 'react'
+import gql from 'graphql-tag'
+import * as R from 'ramda'
+import React, { useState } from 'react'
+import { useHistory } from 'react-router-dom'
 
+import { Button } from 'src/components/buttons'
 import TitleSection from 'src/components/layout/TitleSection'
+import { H1, Info2, TL2, Label1 } from 'src/components/typography'
+import AddMachine from 'src/pages/AddMachine'
 import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
 import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
 
@@ -13,40 +20,88 @@ import LeftSide from './LeftSide'
 import RightSide from './RightSide'
 const useStyles = makeStyles(styles)
 
-const Dashboard = () => {
-  const classes = useStyles()
+const GET_DATA = gql`
+  query getData {
+    machines {
+      name
+    }
+    serverVersion
+  }
+`
 
-  return (
-    <>
-      <TitleSection title="Dashboard">
-        <div className={classes.headerLabels}>
-          <div
-            className={classnames(
-              classes.headerLabelContainer,
-              classes.headerLabelContainerMargin
-            )}>
-            <TxOutIcon />
-            <span className={classes.headerLabelSpan}>Cash-out</span>
+const Dashboard = () => {
+  const history = useHistory()
+  const classes = useStyles()
+  const [open, setOpen] = useState(false)
+
+  const { data, loading } = useQuery(GET_DATA)
+
+  const onPaired = machine => {
+    setOpen(false)
+    history.push('/maintenance/machine-status', { id: machine.deviceId })
+  }
+
+  return !loading ? (
+    !R.isEmpty(data.machines) ? (
+      <>
+        <TitleSection title="Dashboard">
+          <div className={classes.headerLabels}>
+            <>
+              <div
+                className={classnames(
+                  classes.headerLabelContainer,
+                  classes.headerLabelContainerMargin
+                )}>
+                <TxOutIcon />
+                <span className={classes.headerLabelSpan}>Cash-out</span>
+              </div>
+              <div className={classes.headerLabelContainer}>
+                <TxInIcon />
+                <span className={classes.headerLabelSpan}>Cash-in</span>
+              </div>
+            </>
           </div>
-          <div className={classes.headerLabelContainer}>
-            <TxInIcon />
-            <span className={classes.headerLabelSpan}>Cash-in</span>
+        </TitleSection>
+        <div className={classes.root}>
+          <Grid container>
+            <Grid container direction="column" item xs={6}>
+              <LeftSide />
+            </Grid>
+            <Grid container direction="column" item xs={6}>
+              <RightSide />
+            </Grid>
+          </Grid>
+        </div>
+        <Footer />
+      </>
+    ) : (
+      <>
+        {open && (
+          <AddMachine close={() => setOpen(false)} onPaired={onPaired} />
+        )}
+        <TitleSection title="Dashboard">
+          <div className={classes.headerLabels}>
+            <span>
+              <TL2 className={classes.inline}>{data?.serverVersion}</TL2>{' '}
+              <Label1 className={classes.inline}> server version</Label1>
+            </span>
+          </div>
+        </TitleSection>
+        <div className={classes.emptyMachinesRoot}>
+          <div className={classes.emptyMachinesContent}>
+            <H1 className={classes.offColor}>No machines on your system yet</H1>
+            <Info2 className={classes.offColor}>
+              To fully take advantage of Lamassu Admin, add a new machine to
+              your system
+            </Info2>
+            <Button onClick={() => setOpen(true)}>+ Add new machine</Button>
           </div>
         </div>
-      </TitleSection>
-
-      <div className={classes.root}>
-        <Grid container>
-          <Grid container direction="column" item xs={6}>
-            <LeftSide />
-          </Grid>
-          <Grid container direction="column" item xs={6}>
-            <RightSide />
-          </Grid>
-        </Grid>
-      </div>
-      <Footer />
-    </>
+        <Footer />
+      </>
+    )
+  ) : (
+    <></>
   )
 }
 
diff --git a/new-lamassu-admin/src/pages/Dashboard/Dashboard.styles.js b/new-lamassu-admin/src/pages/Dashboard/Dashboard.styles.js
index f83fc58c..6526c4a4 100644
--- a/new-lamassu-admin/src/pages/Dashboard/Dashboard.styles.js
+++ b/new-lamassu-admin/src/pages/Dashboard/Dashboard.styles.js
@@ -1,5 +1,12 @@
 import typographyStyles from 'src/components/typography/styles'
-import { spacer, white, primaryColor } from 'src/styling/variables'
+import {
+  spacer,
+  white,
+  primaryColor,
+  zircon,
+  zircon2,
+  offDarkColor
+} from 'src/styling/variables'
 const { label1 } = typographyStyles
 
 const styles = {
@@ -23,6 +30,11 @@ const styles = {
     display: 'flex',
     marginBottom: 120
   },
+  emptyMachinesRoot: {
+    height: 300,
+    backgroundColor: zircon,
+    border: `solid 2px ${zircon2}`
+  },
   card: {
     wordWrap: 'break-word',
     boxShadow: '0 0 4px 0 rgba(0, 0, 0, 0.08)',
@@ -75,6 +87,25 @@ const styles = {
   displayFlex: {
     display: 'flex',
     flexDirection: 'column'
+  },
+  inline: {
+    display: 'inline'
+  },
+  emptyMachinesContent: {
+    display: 'flex',
+    flexDirection: 'column',
+    height: '100%',
+    justifyContent: 'center',
+    alignItems: 'center',
+    '& > :first-child': {
+      marginTop: 0
+    },
+    '& > *': {
+      marginTop: 25
+    }
+  },
+  offColor: {
+    color: offDarkColor
   }
 }
 
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.js
index 04c9bd7a..07f76fe4 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.js
@@ -10,7 +10,7 @@ import styles from './SystemPerformance.styles'
 const useStyles = makeStyles(styles)
 const ranges = ['Month', 'Week', 'Day']
 
-const Nav = ({ handleSetRange }) => {
+const Nav = ({ handleSetRange, showPicker }) => {
   const classes = useStyles()
   const [clickedItem, setClickedItem] = useState('Day')
 
@@ -25,22 +25,24 @@ const Nav = ({ handleSetRange }) => {
       <div className={classes.titleAndButtonsContainer}>
         <H4 className={classes.h4}>{'System performance'}</H4>
       </div>
-      <div className={classes.navContainer}>
-        {ranges.map((it, idx) => {
-          return (
-            <div
-              key={idx}
-              onClick={e => handleClick(e.target.innerText)}
-              className={
-                isSelected(it)
-                  ? classnames(classes.newHighlightedLabel, classes.navButton)
-                  : classnames(classes.label, classes.navButton)
-              }>
-              {it}
-            </div>
-          )
-        })}
-      </div>
+      {showPicker && (
+        <div className={classes.navContainer}>
+          {ranges.map((it, idx) => {
+            return (
+              <div
+                key={idx}
+                onClick={e => handleClick(e.target.innerText)}
+                className={
+                  isSelected(it)
+                    ? classnames(classes.newHighlightedLabel, classes.navButton)
+                    : classnames(classes.label, classes.navButton)
+                }>
+                {it}
+              </div>
+            )
+          })}
+        </div>
+      )}
     </div>
   )
 }
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js
index 21610885..500c1bd8 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js
@@ -8,6 +8,7 @@ import gql from 'graphql-tag'
 import * as R from 'ramda'
 import React, { useState } from 'react'
 
+import { EmptyTable } from 'src/components/table'
 import { Label1, Label2 } from 'src/components/typography/index'
 import { ReactComponent as PercentDownIcon } from 'src/styling/icons/dashboard/down.svg'
 import { ReactComponent as PercentNeutralIcon } from 'src/styling/icons/dashboard/equal.svg'
@@ -171,8 +172,17 @@ const SystemPerformance = () => {
 
   return (
     <>
-      <Nav handleSetRange={setSelectedRange} />
-      {!loading && (
+      <Nav
+        showPicker={!loading && !R.isEmpty(data.transactions)}
+        handleSetRange={setSelectedRange}
+      />
+      {!loading && R.isEmpty(data.transactions) && (
+        <EmptyTable
+          className={classes.emptyTransactions}
+          message="No transactions so far"
+        />
+      )}
+      {!loading && !R.isEmpty(data.transactions) && (
         <>
           <Grid container spacing={2}>
             <Grid item xs={3}>
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.styles.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.styles.js
index f68912a1..f6d8c1cf 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.styles.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.styles.js
@@ -134,6 +134,9 @@ const styles = {
   labelMargin: {
     marginBottom: 20,
     marginRight: 32
+  },
+  emptyTransactions: {
+    paddingTop: 40
   }
 }