diff --git a/src/pages/stamps/CreatePostageStampModal.tsx b/src/pages/stamps/CreatePostageStampModal.tsx
index 2379aa5..5928a5c 100644
--- a/src/pages/stamps/CreatePostageStampModal.tsx
+++ b/src/pages/stamps/CreatePostageStampModal.tsx
@@ -111,7 +111,7 @@ export default function FormDialog({ label }: Props): ReactElement {
     >
       {({ submitForm, isValid, isSubmitting, values }) => (
         <Form>
-          <Button variant="outlined" color="primary" onClick={handleClickOpen}>
+          <Button variant="contained" onClick={handleClickOpen}>
             {label || 'Buy Postage Stamp'}
             {isSubmitting && <CircularProgress size={24} className={classes.buttonProgress} />}
           </Button>
@@ -138,12 +138,11 @@ export default function FormDialog({ label }: Props): ReactElement {
               <Field component={TextField} name="label" label="Label" fullWidth className={classes.field} />
             </DialogContent>
             <DialogActions>
-              <Button onClick={handleClose} color="primary">
+              <Button onClick={handleClose} variant="contained">
                 Cancel
               </Button>
               <div className={classes.wrapper}>
                 <Button
-                  color="primary"
                   disabled={isSubmitting || !isValid || !values.amount || !values.depth}
                   type="submit"
                   variant="contained"
diff --git a/src/pages/stamps/StampsTable.tsx b/src/pages/stamps/StampsTable.tsx
index 9bd2b2d..fcc601f 100644
--- a/src/pages/stamps/StampsTable.tsx
+++ b/src/pages/stamps/StampsTable.tsx
@@ -1,53 +1,25 @@
-import { Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from '@material-ui/core'
-import { makeStyles } from '@material-ui/core/styles'
 import type { ReactElement } from 'react'
-import ClipboardCopy from '../../components/ClipboardCopy'
-import PeerDetailDrawer from '../../components/PeerDetail'
 import { EnrichedPostageBatch } from '../../providers/Stamps'
+import ExpandableList from '../../components/ExpandableList'
+import ExpandableListItem from '../../components/ExpandableListItem'
+import ExpandableListItemKey from '../../components/ExpandableListItemKey'
 
-const useStyles = makeStyles({
-  table: {
-    minWidth: 650,
-  },
-  values: {
-    textAlign: 'right',
-    fontFamily: 'monospace, monospace',
-  },
-})
 interface Props {
   postageStamps: EnrichedPostageBatch[] | null
 }
 
 function StampsTable({ postageStamps }: Props): ReactElement | null {
   if (postageStamps === null) return null
-  const classes = useStyles()
 
   return (
-    <TableContainer component={Paper}>
-      <Table className={classes.table} size="small" aria-label="Balances Table">
-        <TableHead>
-          <TableRow>
-            <TableCell>Batch ID</TableCell>
-            <TableCell align="right">Usage</TableCell>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {postageStamps.map(({ batchID, usageText }) => (
-            <TableRow key={batchID}>
-              <TableCell>
-                <div style={{ display: 'flex' }}>
-                  <small>
-                    <PeerDetailDrawer peerId={batchID} />
-                  </small>
-                  <ClipboardCopy value={batchID} />
-                </div>
-              </TableCell>
-              <TableCell className={classes.values}>{usageText}</TableCell>
-            </TableRow>
-          ))}
-        </TableBody>
-      </Table>
-    </TableContainer>
+    <ExpandableList label="Postage Stamps" defaultOpen>
+      {postageStamps.map(({ batchID, usageText }) => (
+        <ExpandableList key={batchID} label={`${batchID.substr(0, 8)}[…]`} level={1} info={`${usageText} (used)`}>
+          <ExpandableListItemKey label="Batch ID" value={batchID} />
+          <ExpandableListItem label="Usage" value={usageText} />
+        </ExpandableList>
+      ))}
+    </ExpandableList>
   )
 }
 
diff --git a/src/pages/stamps/index.tsx b/src/pages/stamps/index.tsx
index 613207a..ec6cd38 100644
--- a/src/pages/stamps/index.tsx
+++ b/src/pages/stamps/index.tsx
@@ -1,26 +1,21 @@
 import { ReactElement, useContext, useEffect } from 'react'
-import { Theme, createStyles, makeStyles } from '@material-ui/core/styles'
+import { createStyles, makeStyles } from '@material-ui/core/styles'
 import { Container, CircularProgress } from '@material-ui/core'
 
 import StampsTable from './StampsTable'
-import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard'
 import CreatePostageStampModal from './CreatePostageStampModal'
 
 import { Context } from '../../providers/Stamps'
-import { Context as BeeContext } from '../../providers/Bee'
 
-const useStyles = makeStyles((theme: Theme) =>
+const useStyles = makeStyles(() =>
   createStyles({
     root: {
       width: '100%',
       display: 'grid',
-      rowGap: theme.spacing(2),
     },
     actions: {
       display: 'flex',
       width: '100%',
-      columnGap: theme.spacing(1),
-      rowGap: theme.spacing(1),
       flex: '0 1 auto',
       flexWrap: 'wrap',
       alignItems: 'center',
@@ -30,8 +25,6 @@ const useStyles = makeStyles((theme: Theme) =>
 
 export default function Accounting(): ReactElement {
   const classes = useStyles()
-
-  const beeContext = useContext(BeeContext)
   const { stamps, isLoading, error, start, stop } = useContext(Context)
   useEffect(() => {
     start()
@@ -39,16 +32,6 @@ export default function Accounting(): ReactElement {
     return () => stop()
   }, [])
 
-  if (beeContext.isLoading) {
-    return (
-      <Container style={{ textAlign: 'center', padding: '50px' }}>
-        <CircularProgress />
-      </Container>
-    )
-  }
-
-  if (!beeContext.status.all) return <TroubleshootConnectionCard />
-
   return (
     <div className={classes.root}>
       {error && (