From 5d6952dbacf0ffeb2f4a6ac967d94ab58e604f8a Mon Sep 17 00:00:00 2001
From: nickofolas <nickofolas@gmail.com>
Date: Mon, 7 Mar 2022 20:03:23 -0600
Subject: [PATCH] First iteration of sleeves UI improvements

---
 .../Sleeve/ui/SleeveAugmentationsModal.tsx    | 116 +++++------
 src/PersonObjects/Sleeve/ui/SleeveElem.tsx    | 153 +++++++--------
 src/PersonObjects/Sleeve/ui/SleeveRoot.tsx    |   9 +-
 src/PersonObjects/Sleeve/ui/StatsElement.tsx  | 181 ++++++++++++++++--
 src/PersonObjects/Sleeve/ui/TaskSelector.tsx  |   8 +-
 5 files changed, 289 insertions(+), 178 deletions(-)

diff --git a/src/PersonObjects/Sleeve/ui/SleeveAugmentationsModal.tsx b/src/PersonObjects/Sleeve/ui/SleeveAugmentationsModal.tsx
index 301137b24..57c402878 100644
--- a/src/PersonObjects/Sleeve/ui/SleeveAugmentationsModal.tsx
+++ b/src/PersonObjects/Sleeve/ui/SleeveAugmentationsModal.tsx
@@ -50,74 +50,62 @@ export function SleeveAugmentationsModal(props: IProps): React.ReactElement {
   return (
     <Modal open={props.open} onClose={props.onClose}>
       <>
-        <Typography>
-          You can purchase Augmentations for your Duplicate Sleeves. These Augmentations have the same effect as they
-          would for you. You can only purchase Augmentations that you have unlocked through Factions.
-          <br />
-          <br />
-          When purchasing an Augmentation for a Duplicate Sleeve, they are immediately installed. This means that the
-          Duplicate Sleeve will immediately lose all of its stat experience.
-        </Typography>
-        <Table size="small" padding="none">
-          <TableBody>
-            {availableAugs.map((aug) => {
-              return (
-                <TableRow key={aug.name}>
-                  <TableCell>
-                    <Button onClick={() => purchaseAugmentation(aug)} disabled={player.money < aug.startingCost}>
-                      Buy
-                    </Button>
-                  </TableCell>
-                  <TableCell>
-                    <Box display="flex">
-                      <Tooltip title={aug.stats || ""}>
-                        <Typography>{aug.name}</Typography>
-                      </Tooltip>
-                    </Box>
-                  </TableCell>
-                  <TableCell>
-                    <Money money={aug.startingCost} player={player} />
-                  </TableCell>
-                </TableRow>
-              );
-            })}
-          </TableBody>
-        </Table>
+        <Box sx={{ mx: 1 }}>
+          <Typography>
+            You can purchase Augmentations for your Duplicate Sleeves. These Augmentations have the same effect as they
+            would for you. You can only purchase Augmentations that you have unlocked through Factions.
+            <br />
+            <br />
+            When purchasing an Augmentation for a Duplicate Sleeve, they are immediately installed. This means that the
+            Duplicate Sleeve will immediately lose all of its stat experience.
+          </Typography>
+          <Box component={Paper} sx={{ my: 1, p: 1 }}>
+            <Table size="small" padding="none">
+              <TableBody>
+                {availableAugs.map((aug) => {
+                  return (
+                    <TableRow key={aug.name}>
+                      <TableCell>
+                        <Button onClick={() => purchaseAugmentation(aug)} disabled={player.money < aug.startingCost}>
+                          Buy
+                        </Button>
+                      </TableCell>
+                      <TableCell>
+                        <Box display="flex">
+                          <Tooltip title={aug.stats || ""}>
+                            <Typography>{aug.name}</Typography>
+                          </Tooltip>
+                        </Box>
+                      </TableCell>
+                      <TableCell>
+                        <Money money={aug.startingCost} player={player} />
+                      </TableCell>
+                    </TableRow>
+                  );
+                })}
+              </TableBody>
+            </Table>
+          </Box>
+        </Box>
 
         {ownedAugNames.length > 0 && (
           <>
-            <Typography>Owned Augmentations:</Typography>
-            {ownedAugNames.map((augName) => {
-              const aug = Augmentations[augName];
-              let tooltip = <></>;
-              if (typeof aug.info === "string") {
-                tooltip = (
-                  <>
-                    <span>{aug.info}</span>
-                    <br />
-                    <br />
-                    {aug.stats}
-                  </>
-                );
-              } else {
-                tooltip = (
-                  <>
-                    {aug.info}
-                    <br />
-                    <br />
-                    {aug.stats}
-                  </>
-                );
-              }
+            <Typography sx={{ mx: 1 }}>Owned Augmentations:</Typography>
+            <Box display="grid" sx={{ gridTemplateColumns: 'repeat(5, 1fr)', m: 1 }}>
+              {ownedAugNames.map((augName) => {
+                const aug = Augmentations[augName];
+                const info = typeof aug.info === "string" ? <span>{aug.info}</span> : aug.info
+                const tooltip = (<>{info}<br /><br />{aug.stats}</>);
 
-              return (
-                <Tooltip key={augName} title={<Typography>{tooltip}</Typography>}>
-                  <Paper>
-                    <Typography>{augName}</Typography>
-                  </Paper>
-                </Tooltip>
-              );
-            })}
+                return (
+                  <Tooltip key={augName} title={<Typography>{tooltip}</Typography>}>
+                    <Paper sx={{ p: 1 }}>
+                      <Typography>{augName}</Typography>
+                    </Paper>
+                  </Tooltip>
+                );
+              })}
+            </Box>
           </>
         )}
       </>
diff --git a/src/PersonObjects/Sleeve/ui/SleeveElem.tsx b/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
index 45a3e909d..61c9f5cbc 100644
--- a/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
+++ b/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
@@ -13,20 +13,16 @@ import { createProgressBarText } from "../../../utils/helpers/createProgressBarT
 
 import { SleeveAugmentationsModal } from "./SleeveAugmentationsModal";
 import { TravelModal } from "./TravelModal";
-import { Money } from "../../../ui/React/Money";
-import { MoneyRate } from "../../../ui/React/MoneyRate";
 import { use } from "../../../ui/Context";
-import { ReputationRate } from "../../../ui/React/ReputationRate";
-import { StatsElement } from "./StatsElement";
+import { StatsElement, EarningsElement } from "./StatsElement";
 import { MoreStatsModal } from "./MoreStatsModal";
 import { MoreEarningsModal } from "./MoreEarningsModal";
 import { TaskSelector } from "./TaskSelector";
 import { FactionWorkType } from "../../../Faction/FactionWorkTypeEnum";
-import { StatsTable } from "../../../ui/React/StatsTable";
 
 import Typography from "@mui/material/Typography";
 import Paper from "@mui/material/Paper";
-import Grid from "@mui/material/Grid";
+import { Box } from "@mui/material";
 import Button from "@mui/material/Button";
 import Tooltip from "@mui/material/Tooltip";
 
@@ -141,86 +137,71 @@ export function SleeveElem(props: IProps): React.ReactElement {
       console.error(`Invalid/Unrecognized taskValue in updateSleeveTaskDescription(): ${abc[0]}`);
   }
 
-  let data: any[][] = [];
-  if (props.sleeve.currentTask === SleeveTaskType.Crime) {
-    data = [
-      [`Money`, <Money money={parseFloat(props.sleeve.currentTaskLocation)} />, `(on success)`],
-      [`Hacking Exp`, numeralWrapper.formatExp(props.sleeve.gainRatesForTask.hack), `(2x on success)`],
-      [`Strength Exp`, numeralWrapper.formatExp(props.sleeve.gainRatesForTask.str), `(2x on success)`],
-      [`Defense Exp`, numeralWrapper.formatExp(props.sleeve.gainRatesForTask.def), `(2x on success)`],
-      [`Dexterity Exp`, numeralWrapper.formatExp(props.sleeve.gainRatesForTask.dex), `(2x on success)`],
-      [`Agility Exp`, numeralWrapper.formatExp(props.sleeve.gainRatesForTask.agi), `(2x on success)`],
-      [`Charisma Exp`, numeralWrapper.formatExp(props.sleeve.gainRatesForTask.cha), `(2x on success)`],
-    ];
-  } else {
-    data = [
-      [`Money:`, <MoneyRate money={5 * props.sleeve.gainRatesForTask.money} />],
-      [`Hacking Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.hack)} / s`],
-      [`Strength Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.str)} / s`],
-      [`Defense Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.def)} / s`],
-      [`Dexterity Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.dex)} / s`],
-      [`Agility Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.agi)} / s`],
-      [`Charisma Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.cha)} / s`],
-    ];
-    if (props.sleeve.currentTask === SleeveTaskType.Company || props.sleeve.currentTask === SleeveTaskType.Faction) {
-      const repGain: number = props.sleeve.getRepGain(player);
-      data.push([`Reputation:`, <ReputationRate reputation={5 * repGain} />]);
-    }
-  }
-
   return (
-    <>
-      <Grid container component={Paper}>
-        <Grid item xs={3}>
-          <StatsElement sleeve={props.sleeve} />
-          <Button onClick={() => setStatsOpen(true)}>More Stats</Button>
-          <Tooltip title={player.money < CONSTANTS.TravelCost ? <Typography>Insufficient funds</Typography> : ""}>
-            <span>
-              <Button onClick={() => setTravelOpen(true)} disabled={player.money < CONSTANTS.TravelCost}>
-                Travel
-              </Button>
-            </span>
-          </Tooltip>
-          <Tooltip
-            title={props.sleeve.shock < 100 ? <Typography>Unlocked when sleeve has fully recovered</Typography> : ""}
-          >
-            <span>
-              <Button onClick={() => setAugmentationsOpen(true)} disabled={props.sleeve.shock < 100}>
-                Manage Augmentations
-              </Button>
-            </span>
-          </Tooltip>
-        </Grid>
-        <Grid item xs={5}>
-          <TaskSelector player={player} sleeve={props.sleeve} setABC={setABC} />
-          <Typography>{desc}</Typography>
-          <Typography>
-            {props.sleeve.currentTask === SleeveTaskType.Crime &&
-              createProgressBarText({
-                progress: props.sleeve.currentTaskTime / props.sleeve.currentTaskMaxTime,
-                totalTicks: 25,
-              })}
-          </Typography>
-          <Button onClick={setTask}>Set Task</Button>
-        </Grid>
-        <Grid item xs={4}>
-          <StatsTable title="Earnings (Pre-Synchronization)" rows={data} />
-          <Button onClick={() => setEarningsOpen(true)}>More Earnings Info</Button>
-        </Grid>
-      </Grid>
-      <MoreStatsModal open={statsOpen} onClose={() => setStatsOpen(false)} sleeve={props.sleeve} />
-      <MoreEarningsModal open={earningsOpen} onClose={() => setEarningsOpen(false)} sleeve={props.sleeve} />
-      <TravelModal
-        open={travelOpen}
-        onClose={() => setTravelOpen(false)}
-        sleeve={props.sleeve}
-        rerender={props.rerender}
-      />
-      <SleeveAugmentationsModal
-        open={augmentationsOpen}
-        onClose={() => setAugmentationsOpen(false)}
-        sleeve={props.sleeve}
-      />
-    </>
+    <Box component={Paper} sx={{ width: 'auto' }}>
+      <Box sx={{ m: 1 }}>
+        <Box display="grid" sx={{ gridTemplateColumns: '1fr 1fr', width: '100%', gap: 1 }}>
+          <Box>
+            <StatsElement sleeve={props.sleeve} />
+            <Box display="grid" sx={{ gridTemplateColumns: '1fr 1fr', width: '100%' }}>
+              <Button onClick={() => setStatsOpen(true)}>More Stats</Button>
+              <Button onClick={() => setEarningsOpen(true)}>More Earnings Info</Button>
+              <Tooltip title={player.money < CONSTANTS.TravelCost ? <Typography>Insufficient funds</Typography> : ""}>
+                <span>
+                  <Button
+                    onClick={() => setTravelOpen(true)}
+                    disabled={player.money < CONSTANTS.TravelCost}
+                    sx={{ width: '100%', height: '100%' }}
+                  >
+                    Travel
+                  </Button>
+                </span>
+              </Tooltip>
+              <Tooltip
+                title={props.sleeve.shock < 100 ? <Typography>Unlocked when sleeve has fully recovered</Typography> : ""}
+              >
+                <span>
+                  <Button
+                    onClick={() => setAugmentationsOpen(true)}
+                    disabled={props.sleeve.shock < 100}
+                    sx={{ width: '100%', height: '100%' }}
+                  >
+                    Manage Augmentations
+                  </Button>
+                </span>
+              </Tooltip>
+            </Box>
+          </Box>
+          <Box>
+            <EarningsElement sleeve={props.sleeve} />
+            <Box>
+              <TaskSelector player={player} sleeve={props.sleeve} setABC={setABC} />
+              <Button onClick={setTask} sx={{ width: '100%' }}>Set Task</Button>
+              <Typography>{desc}</Typography>
+              <Typography>
+                {props.sleeve.currentTask === SleeveTaskType.Crime &&
+                  createProgressBarText({
+                    progress: props.sleeve.currentTaskTime / props.sleeve.currentTaskMaxTime,
+                    totalTicks: 25,
+                  })}
+              </Typography>
+            </Box>
+          </Box>
+          <MoreStatsModal open={statsOpen} onClose={() => setStatsOpen(false)} sleeve={props.sleeve} />
+          <MoreEarningsModal open={earningsOpen} onClose={() => setEarningsOpen(false)} sleeve={props.sleeve} />
+          <TravelModal
+            open={travelOpen}
+            onClose={() => setTravelOpen(false)}
+            sleeve={props.sleeve}
+            rerender={props.rerender}
+          />
+          <SleeveAugmentationsModal
+            open={augmentationsOpen}
+            onClose={() => setAugmentationsOpen(false)}
+            sleeve={props.sleeve}
+          />
+        </Box>
+      </Box>
+    </Box >
   );
 }
diff --git a/src/PersonObjects/Sleeve/ui/SleeveRoot.tsx b/src/PersonObjects/Sleeve/ui/SleeveRoot.tsx
index 808b84723..a41a59e87 100644
--- a/src/PersonObjects/Sleeve/ui/SleeveRoot.tsx
+++ b/src/PersonObjects/Sleeve/ui/SleeveRoot.tsx
@@ -7,6 +7,7 @@ import { use } from "../../../ui/Context";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import Link from "@mui/material/Link";
+import { Box } from "@mui/material";
 
 export function SleeveRoot(): React.ReactElement {
   const player = use.Player();
@@ -41,9 +42,11 @@ export function SleeveRoot(): React.ReactElement {
       >
         <Typography> Documentation</Typography>
       </Link>
-      {player.sleeves.map((sleeve, i) => (
-        <SleeveElem key={i} rerender={rerender} sleeve={sleeve} />
-      ))}
+      <Box display="grid" sx={{ gridTemplateColumns: 'repeat(2, 1fr)' }}>
+        {player.sleeves.map((sleeve, i) => (
+          <SleeveElem key={i} rerender={rerender} sleeve={sleeve} />
+        ))}
+      </Box>
       <FAQModal open={FAQOpen} onClose={() => setFAQOpen(false)} />
     </>
   );
diff --git a/src/PersonObjects/Sleeve/ui/StatsElement.tsx b/src/PersonObjects/Sleeve/ui/StatsElement.tsx
index 9e51214fc..d348280e6 100644
--- a/src/PersonObjects/Sleeve/ui/StatsElement.tsx
+++ b/src/PersonObjects/Sleeve/ui/StatsElement.tsx
@@ -1,31 +1,172 @@
 import { Sleeve } from "../Sleeve";
 import { numeralWrapper } from "../../../ui/numeralFormat";
 import React from "react";
+import Typography from "@mui/material/Typography";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableRow,
+} from "@mui/material";
 
-import { StatsTable } from "../../../ui/React/StatsTable";
+import { Settings } from "../../../Settings/Settings";
+import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { characterOverviewStyles as useStyles } from "../../../ui/React/CharacterOverview";
+
+import { Money } from "../../../ui/React/Money";
+import { MoneyRate } from "../../../ui/React/MoneyRate";
+import { ReputationRate } from "../../../ui/React/ReputationRate";
+import { SleeveTaskType } from "../SleeveTaskTypesEnum";
+import { use } from "../../../ui/Context";
+
+interface ITableRowData {
+  content?: string;
+  level?: number;
+  exp?: number;
+}
+
+export const generateTableRow = (
+  name: string,
+  color: string,
+  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+  classes: any,
+  data: ITableRowData
+): React.ReactElement => {
+  let content;
+
+  if (data.content !== undefined) {
+    content = data.content;
+  } else if (data.level !== undefined && data.exp !== undefined) {
+    content = `${formatNumber(data.level, 0)} (${numeralWrapper.formatExp(data.exp)} exp)`;
+  } else if (data.level !== undefined && data.exp === undefined) {
+    content = `${formatNumber(data.level, 0)}`;
+  }
+
+  return (
+    <TableRow>
+      <TableCell classes={{ root: classes.cellNone }}>
+        <Typography style={{ color: color }}>{name}</Typography>
+      </TableCell>
+      <TableCell align="right" classes={{ root: classes.cellNone }}>
+        <Typography style={{ color: color }}>
+          {content}
+        </Typography>
+      </TableCell>
+    </TableRow>
+  )
+}
 
 interface IProps {
   sleeve: Sleeve;
 }
 
 export function StatsElement(props: IProps): React.ReactElement {
-  const rows = [
-    [
-      "HP: ",
-      <>
-        {numeralWrapper.formatHp(props.sleeve.hp)} / {numeralWrapper.formatHp(props.sleeve.max_hp)}
-      </>,
-    ],
-    ["City: ", <>{props.sleeve.city}</>],
-    ["Hacking: ", <>{numeralWrapper.formatSkill(props.sleeve.hacking)}</>],
-    ["Strength: ", <>{numeralWrapper.formatSkill(props.sleeve.strength)}</>],
-    ["Defense: ", <>{numeralWrapper.formatSkill(props.sleeve.defense)}</>],
-    ["Dexterity: ", <>{numeralWrapper.formatSkill(props.sleeve.dexterity)}</>],
-    ["Agility: ", <>{numeralWrapper.formatSkill(props.sleeve.agility)}</>],
-    ["Charisma: ", <>{numeralWrapper.formatSkill(props.sleeve.charisma)}</>],
-    ["Shock: ", <>{numeralWrapper.formatSleeveShock(100 - props.sleeve.shock)}</>],
-    ["Sync: ", <>{numeralWrapper.formatSleeveSynchro(props.sleeve.sync)}</>],
-    ["Memory: ", <>{numeralWrapper.formatSleeveMemory(props.sleeve.memory)}</>],
-  ];
-  return <StatsTable rows={rows} />;
+  const classes = useStyles();
+
+  return (
+    <Table sx={{ display: 'table', mb: 1, width: '100%' }}>
+      <TableBody>
+        {generateTableRow("City", Settings.theme.primary, classes, {
+          content: props.sleeve.city
+        })}
+        {generateTableRow("HP", Settings.theme.hp, classes, {
+          content: `${numeralWrapper.formatHp(props.sleeve.hp)} / ${numeralWrapper.formatHp(props.sleeve.max_hp)}`
+        })}
+        {generateTableRow("Hacking", Settings.theme.hack, classes, {
+          level: props.sleeve.hacking,
+          exp: props.sleeve.hacking_exp
+        })}
+        {generateTableRow("Strength", Settings.theme.combat, classes, {
+          level: props.sleeve.strength,
+          exp: props.sleeve.strength_exp
+        })}
+        {generateTableRow("Defense", Settings.theme.combat, classes, {
+          level: props.sleeve.defense,
+          exp: props.sleeve.defense_exp
+        })}
+        {generateTableRow("Dexterity", Settings.theme.combat, classes, {
+          level: props.sleeve.dexterity,
+          exp: props.sleeve.dexterity_exp
+        })}
+        {generateTableRow("Agility", Settings.theme.combat, classes, {
+          level: props.sleeve.agility,
+          exp: props.sleeve.agility_exp
+        })}
+        {generateTableRow("Charisma", Settings.theme.cha, classes, {
+          level: props.sleeve.charisma,
+          exp: props.sleeve.charisma_exp
+        })}
+        <TableRow>
+          <TableCell classes={{ root: classes.cellNone }}>
+            <br />
+          </TableCell>
+        </TableRow>
+        {generateTableRow("Shock", Settings.theme.primary, classes, {
+          content: numeralWrapper.formatSleeveShock(100 - props.sleeve.shock)
+        })}
+        {generateTableRow("Sync", Settings.theme.primary, classes, {
+          content: numeralWrapper.formatSleeveSynchro(props.sleeve.sync)
+        })}
+        {generateTableRow("Memory", Settings.theme.primary, classes, {
+          content: numeralWrapper.formatSleeveMemory(props.sleeve.memory)
+        })}
+      </TableBody>
+    </Table>
+  )
 }
+
+export function EarningsElement(props: IProps): React.ReactElement {
+  const classes = useStyles();
+  const player = use.Player();
+
+  let data: any[][] = [];
+  if (props.sleeve.currentTask === SleeveTaskType.Crime) {
+    data = [
+      [`Money`, <><Money money={parseFloat(props.sleeve.currentTaskLocation)} /> (on success)</>],
+      [`Hacking Exp`, `${numeralWrapper.formatExp(props.sleeve.gainRatesForTask.hack)} (2x on success)`],
+      [`Strength Exp`, `${numeralWrapper.formatExp(props.sleeve.gainRatesForTask.str)} (2x on success)`],
+      [`Defense Exp`, `${numeralWrapper.formatExp(props.sleeve.gainRatesForTask.def)} (2x on success)`],
+      [`Dexterity Exp`, `${numeralWrapper.formatExp(props.sleeve.gainRatesForTask.dex)} (2x on success)`],
+      [`Agility Exp`, `${numeralWrapper.formatExp(props.sleeve.gainRatesForTask.agi)} (2x on success)`],
+      [`Charisma Exp`, `${numeralWrapper.formatExp(props.sleeve.gainRatesForTask.cha)} (2x on success)`],
+    ];
+  } else {
+    data = [
+      [`Money:`, <MoneyRate money={5 * props.sleeve.gainRatesForTask.money} />],
+      [`Hacking Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.hack)} / sec`],
+      [`Strength Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.str)} / sec`],
+      [`Defense Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.def)} / sec`],
+      [`Dexterity Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.dex)} / sec`],
+      [`Agility Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.agi)} / sec`],
+      [`Charisma Exp:`, `${numeralWrapper.formatExp(5 * props.sleeve.gainRatesForTask.cha)} / sec`],
+    ];
+    if (props.sleeve.currentTask === SleeveTaskType.Company || props.sleeve.currentTask === SleeveTaskType.Faction) {
+      const repGain: number = props.sleeve.getRepGain(player);
+      data.push([`Reputation:`, <ReputationRate reputation={5 * repGain} />]);
+    }
+  }
+
+  return (
+    <Table sx={{ display: 'table', mb: 1, width: '100%', lineHeight: 0 }}>
+      <TableBody>
+        <TableRow>
+          <TableCell classes={{ root: classes.cellNone }}>
+            <Typography variant='h6'>
+              Earnings
+            </Typography>
+          </TableCell>
+        </TableRow>
+        {data.map(([a, b]) => (
+          <TableRow key={a.toString() + b.toString()}>
+            <TableCell classes={{ root: classes.cellNone }}>
+              <Typography>{a}</Typography>
+            </TableCell>
+            <TableCell align="right" classes={{ root: classes.cellNone }}>
+              <Typography>{b}</Typography>
+            </TableCell>
+          </TableRow>
+        ))}
+      </TableBody>
+    </Table>
+  )
+}
\ No newline at end of file
diff --git a/src/PersonObjects/Sleeve/ui/TaskSelector.tsx b/src/PersonObjects/Sleeve/ui/TaskSelector.tsx
index 724352aaa..bff6af55e 100644
--- a/src/PersonObjects/Sleeve/ui/TaskSelector.tsx
+++ b/src/PersonObjects/Sleeve/ui/TaskSelector.tsx
@@ -278,7 +278,7 @@ export function TaskSelector(props: IProps): React.ReactElement {
 
   return (
     <>
-      <Select onChange={onS0Change} value={s0}>
+      <Select onChange={onS0Change} value={s0} sx={{ width: '100%' }}>
         {validActions.map((task) => (
           <MenuItem key={task} value={task}>
             {task}
@@ -287,8 +287,7 @@ export function TaskSelector(props: IProps): React.ReactElement {
       </Select>
       {!(details.first.length === 1 && details.first[0] === "------") && (
         <>
-          <br />
-          <Select onChange={onS1Change} value={s1}>
+          <Select onChange={onS1Change} value={s1} sx={{ width: '100%' }}>
             {details.first.map((detail) => (
               <MenuItem key={detail} value={detail}>
                 {detail}
@@ -299,8 +298,7 @@ export function TaskSelector(props: IProps): React.ReactElement {
       )}
       {!(details2.length === 1 && details2[0] === "------") && (
         <>
-          <br />
-          <Select onChange={onS2Change} value={s2}>
+          <Select onChange={onS2Change} value={s2} sx={{ width: '100%' }}>
             {details2.map((detail) => (
               <MenuItem key={detail} value={detail}>
                 {detail}