diff --git a/www/src/components/Table/ColumnMenu/NewColumn.tsx b/www/src/components/Table/ColumnMenu/NewColumn.tsx
index d998d3df..5a3af4a6 100644
--- a/www/src/components/Table/ColumnMenu/NewColumn.tsx
+++ b/www/src/components/Table/ColumnMenu/NewColumn.tsx
@@ -2,124 +2,160 @@ import React, { useState, useEffect } from "react";
 import _camel from "lodash/camelCase";
 
 import {
+  makeStyles,
+  createStyles,
+  Dialog,
+  DialogTitle,
+  IconButton,
+  DialogContent,
+  Grid,
   Button,
   TextField,
-  Dialog,
-  Grid,
   DialogActions,
-  DialogContent,
-  Typography,
-  IconButton,
 } from "@material-ui/core";
 import CloseIcon from "@material-ui/icons/Close";
 
 import { FieldType } from "constants/fields";
 import FieldsDropdown from "./FieldsDropdown";
+import { MONO_FONT } from "Theme";
+
+const useStyles = makeStyles((theme) =>
+  createStyles({
+    root: { userSelect: "none" },
+
+    closeButton: {
+      position: "absolute",
+      top: theme.spacing(0.5),
+      right: theme.spacing(0.5),
+    },
+
+    content: { paddingBottom: theme.spacing(1.5) },
+
+    helperText: {
+      ...theme.typography.body2,
+      marginTop: theme.spacing(1),
+    },
+
+    fieldKey: { fontFamily: MONO_FONT },
+  })
+);
+
+export interface IFormDialogProps {
+  open: boolean;
+  data: any;
+  handleClose: () => void;
+  handleSave: (fieldKey: string, data: any) => void;
+}
 
 export default function FormDialog({
   open,
   data,
   handleClose,
   handleSave,
-}: {
-  open: boolean;
-  data: any;
-  handleClose: Function;
-  handleSave: Function;
-}) {
-  const [type, setType] = useState(FieldType.shortText);
+}: IFormDialogProps) {
+  const classes = useStyles();
+
   const [columnLabel, setColumnLabel] = useState("");
   const [fieldKey, setFieldKey] = useState("");
+  const [type, setType] = useState(FieldType.shortText);
+
   useEffect(() => {
-    setFieldKey(_camel(columnLabel));
+    if (type !== FieldType.id) setFieldKey(_camel(columnLabel));
   }, [columnLabel]);
 
-  return (
-    <div>
-      <Dialog
-        open={open}
-        onClose={(e, r) => {
-          handleClose();
-        }}
-        aria-labelledby="new-column"
-      >
-        <DialogContent>
-          <Grid
-            container
-            justify="space-between"
-            alignContent="flex-start"
-            direction="row"
-          >
-            <Typography variant="h6">Add new column</Typography>
-            <IconButton
-              onClick={() => {
-                handleClose();
-              }}
-            >
-              <CloseIcon />
-            </IconButton>
-          </Grid>
-          <Typography variant="overline">Column Name</Typography>
-          <TextField
-            value={columnLabel}
-            autoFocus
-            variant="filled"
-            id="columnName"
-            label="Column Header"
-            type="text"
-            fullWidth
-            onChange={(e) => {
-              setColumnLabel(e.target.value);
-            }}
-          />
-          <Typography variant="overline">Field Key</Typography>
-          <TextField
-            value={fieldKey}
-            variant="filled"
-            id="fieldKey"
-            label="Field Key"
-            type="text"
-            fullWidth
-            onChange={(e) => {
-              setFieldKey(e.target.value);
-            }}
-          />
-          <Typography variant="overline">Column Type</Typography>
+  useEffect(() => {
+    if (type === FieldType.id) setFieldKey("id");
+  }, [type]);
 
-          <FieldsDropdown
-            value={type}
-            onChange={(newType) => {
-              setType(newType.target.value as FieldType);
-            }}
-          />
-        </DialogContent>
-        <DialogActions>
-          <Button
-            onClick={() => {
-              handleClose();
-            }}
-            color="primary"
-          >
-            Cancel
-          </Button>
-          <Button
-            onClick={() => {
-              //const fieldName = _camel(name);
-              handleSave(fieldKey, {
-                type,
-                name: columnLabel,
-                fieldName: fieldKey,
-                key: fieldKey,
-                config: {},
-                ...data.initializeColumn,
-              });
-            }}
-            color="primary"
-          >
-            Add
-          </Button>
-        </DialogActions>
-      </Dialog>
-    </div>
+  return (
+    <Dialog
+      open={open}
+      onClose={handleClose}
+      aria-labelledby="add-new-column"
+      fullWidth
+      maxWidth="xs"
+      className={classes.root}
+    >
+      <DialogTitle id="add-new-column">Add New Column</DialogTitle>
+
+      <IconButton onClick={handleClose} className={classes.closeButton}>
+        <CloseIcon />
+      </IconButton>
+
+      <DialogContent className={classes.content}>
+        <Grid container spacing={3} direction="column" wrap="nowrap">
+          <Grid item>
+            <TextField
+              value={columnLabel}
+              autoFocus
+              variant="filled"
+              id="columnName"
+              label="Column Name"
+              type="text"
+              fullWidth
+              onChange={(e) => setColumnLabel(e.target.value)}
+              helperText="Set the user-facing name for this column."
+              FormHelperTextProps={{ classes: { root: classes.helperText } }}
+            />
+          </Grid>
+
+          <Grid item>
+            <TextField
+              value={fieldKey}
+              variant="filled"
+              id="fieldKey"
+              label="Field Key"
+              type="text"
+              fullWidth
+              onChange={(e) => setFieldKey(e.target.value)}
+              disabled={type === FieldType.id && fieldKey === "id"}
+              helperText={
+                <>
+                  Set the Firestore field key to link to this column.
+                  <br />
+                  It will display any existing data for this field key.
+                </>
+              }
+              FormHelperTextProps={{ classes: { root: classes.helperText } }}
+            />
+          </Grid>
+
+          <Grid item>
+            <FieldsDropdown
+              value={type}
+              onChange={(newType) => setType(newType.target.value as FieldType)}
+            />
+          </Grid>
+        </Grid>
+      </DialogContent>
+
+      <DialogActions>
+        <Button
+          onClick={() => {
+            handleClose();
+          }}
+          color="primary"
+        >
+          Cancel
+        </Button>
+        <Button
+          onClick={() => {
+            handleSave(fieldKey, {
+              type,
+              name: columnLabel,
+              fieldName: fieldKey,
+              key: fieldKey,
+              config: {},
+              ...data.initializeColumn,
+            });
+          }}
+          color="primary"
+          variant="contained"
+          disabled={!columnLabel || !fieldKey || !type}
+        >
+          Add
+        </Button>
+      </DialogActions>
+    </Dialog>
   );
 }
diff --git a/www/src/components/Table/FinalColumnHeader.tsx b/www/src/components/Table/FinalColumnHeader.tsx
index b334253e..1b0d0db1 100644
--- a/www/src/components/Table/FinalColumnHeader.tsx
+++ b/www/src/components/Table/FinalColumnHeader.tsx
@@ -1,13 +1,7 @@
 import React from "react";
 import { Column } from "react-data-grid";
 
-import {
-  makeStyles,
-  createStyles,
-  Tooltip,
-  Grid,
-  Button,
-} from "@material-ui/core";
+import { makeStyles, createStyles, Grid, Button } from "@material-ui/core";
 import AddColumnIcon from "assets/icons/AddColumn";
 
 import { useFiretableContext } from "contexts/firetableContext";