diff --git a/TODO.txt b/TODO.txt
index 8517217..48c8162 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,6 +1,4 @@
-Add Steadings tables
 Change steadings and mounts to not show English names by default
-Make everything look nicer
-Maybe put roller button in a left nav bar and the results in the middle?
-Add a copy-to-clipboard option
+Make everything look more nicer
+get the roll sound working on all reroll events
 Add a 3d dice rolling visualizer
\ No newline at end of file
diff --git a/src/App.svelte b/src/App.svelte
index f815295..6d7bc9c 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -17,6 +17,7 @@
   import Footer from "./components/Footer.svelte";
   import MultiCard from "./components/MultiCard.svelte";
   import { RollCard } from "./types/RollCard";
+  import type { RerolledEvent } from "./types/RerolledEvent";
 
   let rollThemBones = new Audio("https://soundbible.com/mp3/Shake And Roll Dice-SoundBible.com-591494296.mp3");
   let playSounds = localStorage?.getItem("playSounds") != "false";
@@ -52,6 +53,11 @@
     }
   }
 
+  function rerolled(event: CustomEvent<RerolledEvent>) {
+    // console.log("rerolled card value", event.detail);
+    playAudio();
+  }
+
   function remove(event: CustomEvent<RollCard>) {
     cards = cards.filter((c) => c.timestamp != event.detail.timestamp);
   }
@@ -94,7 +100,7 @@
       <Col sm="9">
         <h3>Results:</h3>
         {#each cards as card}
-          <MultiCard {card} on:remove={remove} />
+          <MultiCard {card} on:rerolled={rerolled} on:remove={remove} />
         {/each}
       </Col>
     </Row>
diff --git a/src/components/CardTitleButtons.svelte b/src/components/CardTitleButtons.svelte
new file mode 100644
index 0000000..04862aa
--- /dev/null
+++ b/src/components/CardTitleButtons.svelte
@@ -0,0 +1,67 @@
+<script lang="ts">
+  import { createEventDispatcher } from "svelte";
+  import { Button, Icon, Tooltip } from "sveltestrap";
+  import { sample } from "lodash";
+
+  import ClipboardHelper from "./ClipboardHelper.svelte";
+
+  const dispatch = createEventDispatcher();
+
+  export let showCopy: boolean = true;
+  export let showReroll: boolean = true;
+  export let showRemove: boolean = true;
+
+  export let data: any;
+  export let dataType: string;
+
+  let rerollIcon = getIcon();
+
+  function getIcon() {
+    return "dice-" + sample([1, 2, 3, 4, 5, 6]);
+  }
+
+  function reroll() {
+    rerollIcon = getIcon();
+    dispatch("reroll");
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
+</script>
+
+<main>
+  <div class="buttons">
+    {#if showCopy}
+      <div class="clipboard">
+        <ClipboardHelper {data} {dataType} />
+      </div>
+    {/if}
+    {#if showReroll}
+      <div class="reroll">
+        <Button id="reroll" outline color="dark" on:click={reroll}>
+          <Icon name={rerollIcon} />
+        </Button>
+        <Tooltip target="reroll" placement="top">Reroll Item</Tooltip>
+      </div>
+    {/if}
+    {#if showRemove}
+      <Button id="remove" outline color="danger" on:click={remove}>
+        <Icon name="x" />
+      </Button>
+      <Tooltip target="remove" placement="top">Remove Item</Tooltip>
+    {/if}
+  </div>
+</main>
+
+<style>
+  .buttons {
+    display: flex;
+  }
+  .clipboard {
+    padding-right: 5px;
+  }
+  .reroll {
+    padding-right: 5px;
+  }
+</style>
diff --git a/src/components/CreatureCard.svelte b/src/components/CreatureCard.svelte
index ddbc94d..e91bddf 100644
--- a/src/components/CreatureCard.svelte
+++ b/src/components/CreatureCard.svelte
@@ -1,30 +1,24 @@
 <script lang="ts">
   import { createEventDispatcher } from "svelte";
   import { capitalize } from "lodash";
-  import {
-    Card,
-    CardHeader,
-    CardTitle,
-    CardBody,
-    CardSubtitle,
-    CardText,
-    CardFooter,
-    Container,
-    Row,
-    Button,
-    Icon,
-    Tooltip,
-  } from "sveltestrap";
+  import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter, Container, Row } from "sveltestrap";
 
-  import ClipboardHelper from "./ClipboardHelper.svelte";
   import NpcCard from "./NpcCard.svelte";
   import DieIcon from "./DieIcon.svelte";
-  import type { Creature } from "../rollers/creatures";
+  import CardButtons from "./CardTitleButtons.svelte";
+  import { Creature, rollCreature } from "../rollers/creatures";
+  import { RerolledEvent } from "../types/RerolledEvent";
 
   const dispatch = createEventDispatcher();
 
   export let creature: Creature;
-  export let timestamp: string;
+  export let timestamp: string = "";
+  export let showRemove: boolean = true;
+
+  function reroll() {
+    creature = rollCreature();
+    dispatch("rerolled", new RerolledEvent("creature", creature));
+  }
 
   function remove() {
     dispatch("remove");
@@ -36,25 +30,24 @@
     <CardHeader>
       <CardTitle>
         <div class="title">
-          <div class="description">
+          <div class="type">
+            Creature:
             {capitalize(creature.type)}<DieIcon value={creature.roll} />
-            {#if creature.subtype !== ""}({creature.subtype})<DieIcon value={creature.subroll} />{/if}: {capitalize(
-              creature.description
-            )}<DieIcon value={creature.specificroll} />
-          </div>
-          <div class="buttons">
-            <ClipboardHelper data={creature} dataType="creature" />
-            <Button id="remove" outline color="danger" on:click={remove}>
-              <Icon name="x" />
-            </Button>
-            <Tooltip target="remove" placement="top">Remove Item</Tooltip>
           </div>
+          <CardButtons data={creature} dataType="creature" showReroll={true} on:reroll={reroll} {showRemove} on:remove={remove} />
         </div>
       </CardTitle>
     </CardHeader>
     <CardBody>
       <CardText>
         <Container>
+          <Row>
+            <strong>Description:</strong>
+            <ul>
+              {#if creature.subtype !== ""}<li>{capitalize(creature.subtype)}<DieIcon value={creature.subroll} /></li>{/if}
+              <li>{capitalize(creature.description)}<DieIcon value={creature.specificroll} /></li>
+            </ul>
+          </Row>
           <Row>
             <strong>Details:</strong>
             <ul>
@@ -81,7 +74,7 @@
               {#if creature.feature}<li>Feature: {creature.feature.description}<DieIcon value={creature.feature.roll} /></li>{/if}
               {#if creature.npc}<li>
                   NPC Stats:
-                  <NpcCard npc={creature.npc} {timestamp} />
+                  <NpcCard npc={creature.npc} showRemove={false} />
                 </li>{/if}
               {#if creature.numAppearing}<li>
                   Number Appearing: {creature.numAppearing.description}
@@ -96,7 +89,9 @@
         </Container>
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
@@ -108,9 +103,6 @@
     display: flex;
     justify-content: space-between;
   }
-  .title .buttons {
-    display: flex;
-  }
   ul {
     margin-left: 2em;
   }
diff --git a/src/components/DangerCard.svelte b/src/components/DangerCard.svelte
index 1502857..ef0f88a 100644
--- a/src/components/DangerCard.svelte
+++ b/src/components/DangerCard.svelte
@@ -1,12 +1,32 @@
 <script lang="ts">
+  import { createEventDispatcher } from "svelte";
   import { capitalize } from "lodash";
   import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter, Icon } from "sveltestrap";
-  import type { Danger } from "../rollers/dangers";
-  import DieIcon from "./DieIcon.svelte";
 
+  import { Danger, rollDanger } from "../rollers/dangers";
+  import CreatureCard from "./CreatureCard.svelte";
+  import DieIcon from "./DieIcon.svelte";
+  import CardButtons from "./CardTitleButtons.svelte";
+  import { RerolledEvent } from "../types/RerolledEvent";
+
+  const dispatch = createEventDispatcher();
   export let danger: Danger;
   export let timestamp: string;
 
+  function reroll() {
+    danger = rollDanger();
+    dispatch("rerolled", new RerolledEvent("danger", danger));
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
+
+  function rerolledCreature(event: CustomEvent<RerolledEvent>) {
+    danger.creature = event.detail.value;
+    dispatch("rerolled", new RerolledEvent("danger", danger));
+  }
+
   let icon = "";
   $: icon =
     danger.category == "unnatural entity"
@@ -22,20 +42,37 @@
   <Card class="mb-3">
     <CardHeader>
       <CardTitle>
-        {capitalize(danger.category)}<DieIcon value={danger.roll} />
-        {#if danger.subcategory !== ""}({danger.subcategory})<DieIcon value={danger.subroll} />{/if}: {capitalize(
-          danger.description
-        )}<DieIcon value={danger.specificroll} />
+        <div class="title">
+          <div class="description">
+            {capitalize(danger.category)}<DieIcon value={danger.roll} />
+            {#if danger.subcategory !== ""}({danger.subcategory})<DieIcon value={danger.subroll} />{/if}: {capitalize(
+              danger.description
+            )}<DieIcon value={danger.specificroll} />
+          </div>
+          <CardButtons data={danger} dataType="danger" on:reroll={reroll} on:remove={remove} />
+        </div>
       </CardTitle>
     </CardHeader>
     <CardBody>
       <CardText>
         <Icon name={icon} />: {danger.description}
+        {#if danger.creature}
+          <CreatureCard creature={danger.creature} on:rerolled={rerolledCreature} showRemove={false} />
+        {/if}
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
 <style>
+  main {
+    text-align: left;
+  }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
 </style>
diff --git a/src/components/DetailsCard.svelte b/src/components/DetailsCard.svelte
index 64a0b4b..30d255e 100644
--- a/src/components/DetailsCard.svelte
+++ b/src/components/DetailsCard.svelte
@@ -1,28 +1,55 @@
 <script lang="ts">
+  import { createEventDispatcher } from "svelte";
   import { capitalize } from "lodash";
   import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter } from "sveltestrap";
-  import type { Detail } from "../rollers/details";
+  import { Detail, rollDetail } from "../rollers/details";
   import DieIcon from "./DieIcon.svelte";
+  import CardButtons from "./CardTitleButtons.svelte";
+  import { RerolledEvent } from "../types/RerolledEvent";
 
+  const dispatch = createEventDispatcher();
   export let detail: Detail;
   export let timestamp: string;
+
+  function reroll() {
+    detail = rollDetail(detail.type);
+    dispatch("rerolled", new RerolledEvent("detail-" + detail.type, detail));
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
 </script>
 
 <main>
   <Card class="mb-3">
     <CardHeader>
       <CardTitle>
-        {capitalize(detail.type)}
-      </CardTitle>
+        <div class="title">
+          <div class="description">
+            Detail: {capitalize(detail.type)}
+          </div>
+          <CardButtons data={detail} dataType={"detail-" + detail.type} on:reroll={reroll} on:remove={remove} />
+        </div></CardTitle
+      >
     </CardHeader>
     <CardBody>
       <CardText>
         {detail.description}<DieIcon value={detail.roll} />
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
 <style>
+  main {
+    text-align: left;
+  }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
 </style>
diff --git a/src/components/DiscoveryCard.svelte b/src/components/DiscoveryCard.svelte
index 0b5a44d..12d2f8b 100644
--- a/src/components/DiscoveryCard.svelte
+++ b/src/components/DiscoveryCard.svelte
@@ -1,39 +1,76 @@
 <script lang="ts">
+  import { createEventDispatcher } from "svelte";
   import { Button, Card, CardHeader, CardTitle, CardBody, CardSubtitle, CardText, CardFooter, Container, Row, Icon } from "sveltestrap";
   import { capitalize } from "lodash";
 
   import DieIcon from "./DieIcon.svelte";
   import CreatureCard from "./CreatureCard.svelte";
   import SteadingCard from "./SteadingCard.svelte";
-  import type { Discovery } from "../rollers/discoveries";
+  import CardButtons from "./CardTitleButtons.svelte";
+  import { Discovery, rollDiscovery } from "../rollers/discoveries";
+  import { RerolledEvent } from "../types/RerolledEvent";
 
+  const dispatch = createEventDispatcher();
   export let discovery: Discovery;
   export let timestamp: string;
+
+  let hasDetails = false;
+  $: hasDetails = !!(
+    discovery.age ||
+    discovery.alignment ||
+    discovery.aspect ||
+    discovery.creature ||
+    discovery.element ||
+    discovery.magicType ||
+    discovery.ruination ||
+    discovery.size ||
+    discovery.steading ||
+    discovery.visibility
+  );
+
+  function reroll() {
+    discovery = rollDiscovery();
+    dispatch("rerolled", new RerolledEvent("discovery", discovery));
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
 </script>
 
 <main>
   <Card class="mb-3">
     <CardHeader>
       <CardTitle>
-        {capitalize(discovery.category)}
-        <DieIcon value={discovery.roll} />
-        {#if discovery.subcategory !== ""}
-          ({discovery.subcategory}<DieIcon value={discovery.subroll} />){/if}: {capitalize(discovery.description)}
-        <DieIcon value={discovery.specificroll} />
-      </CardTitle>
+        <div class="title">
+          <div class="description">
+            Discovery:
+            {capitalize(discovery.category)}
+            <DieIcon value={discovery.roll} />
+          </div>
+          <CardButtons data={discovery} dataType="discovery" on:reroll={reroll} on:remove={remove} />
+        </div></CardTitle
+      >
     </CardHeader>
     <CardBody>
       <CardText>
         <Container>
+          <h4>
+            Type{#if discovery.subcategory !== ""}&nbsp;{capitalize(discovery.subcategory)}<DieIcon value={discovery.subroll} />{/if}: {capitalize(
+              discovery.description
+            )}
+            <DieIcon value={discovery.specificroll} />
+          </h4>
+
           {#if discovery.category == "creature"}
             <Row>
-              <CreatureCard creature={discovery.creature} {timestamp} />
+              <CreatureCard creature={discovery.creature} showRemove={false} />
             </Row>
-          {:else if discovery.category == "steading"}
+          {:else if discovery.category == "structure" && discovery.steading}
             <Row>
-              <SteadingCard steading={discovery.steading} {timestamp} />
+              <SteadingCard steading={discovery.steading} showRemove={false} />
             </Row>
-          {:else}
+          {:else if hasDetails}
             <Row>
               <strong>Details:</strong>
               <ul>
@@ -44,7 +81,7 @@
                 {#if discovery.aspect}<li>Aspect: {discovery.aspect.description}<DieIcon value={discovery.aspect.roll} /></li>{/if}
                 {#if discovery.creature}<li>
                     Produced/Inhabited By: {discovery.creature.description}<DieIcon value={discovery.creature.roll} />
-                    <CreatureCard creature={discovery.creature} {timestamp} />
+                    <CreatureCard creature={discovery.creature} {timestamp} showRemove={false} />
                   </li>{/if}
                 {#if discovery.element}<li>Element: {discovery.element.description}<DieIcon value={discovery.element.roll} /></li>{/if}
                 {#if discovery.magicType}<li>
@@ -64,7 +101,9 @@
         </Container>
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
@@ -72,6 +111,10 @@
   main {
     text-align: left;
   }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
   ul {
     margin-left: 2em;
   }
diff --git a/src/components/DungeonCard.svelte b/src/components/DungeonCard.svelte
index b95cfab..37b55b9 100644
--- a/src/components/DungeonCard.svelte
+++ b/src/components/DungeonCard.svelte
@@ -1,12 +1,25 @@
 <script lang="ts">
+  import { createEventDispatcher } from "svelte";
   import { Card, CardHeader, CardTitle, CardBody, CardSubtitle, CardText, CardFooter, Container, Row, Icon } from "sveltestrap";
   import { capitalize } from "lodash";
 
-  import type { Dungeon } from "../rollers/dungeons";
+  import { Dungeon, rollDungeon } from "../rollers/dungeons";
+  import CardButtons from "./CardTitleButtons.svelte";
+  import { RerolledEvent } from "../types/RerolledEvent";
 
+  const dispatch = createEventDispatcher();
   export let dungeon: Dungeon;
   export let timestamp;
 
+  function reroll() {
+    dungeon = rollDungeon();
+    dispatch("rerolled", new RerolledEvent("dungeon", dungeon));
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
+
   function getIcon(t: string, c: string): string {
     return t == "discovery"
       ? "eye-fill"
@@ -25,7 +38,16 @@
 <main>
   <Card class="mb-3">
     <CardHeader>
-      <CardTitle>{capitalize(dungeon.size.description)} {dungeon.function.description} built by {dungeon.builder.description}</CardTitle>
+      <CardTitle>
+        <div class="title">
+          <div class="description">
+            Dungeon:
+            {capitalize(dungeon.size.description)}
+            {dungeon.function.description} built by {dungeon.builder.description}
+          </div>
+          <CardButtons data={dungeon} dataType="dungeon" on:reroll={reroll} on:remove={remove} />
+        </div>
+      </CardTitle>
     </CardHeader>
     <CardBody>
       <CardSubtitle>
@@ -68,7 +90,9 @@
         </Container>
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
@@ -76,6 +100,10 @@
   main {
     text-align: left;
   }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
   ul {
     margin-left: 2em;
   }
diff --git a/src/components/FollowerCard.svelte b/src/components/FollowerCard.svelte
index dd64ec7..763cbcf 100644
--- a/src/components/FollowerCard.svelte
+++ b/src/components/FollowerCard.svelte
@@ -1,15 +1,36 @@
 <script lang="ts">
+  import { createEventDispatcher } from "svelte";
   import { Card, CardHeader, CardTitle, CardBody, CardSubtitle, CardText, CardFooter, Container, Col, Row } from "sveltestrap";
-  import type { Follower } from "../rollers/followers";
+  import { Follower, rollFollower } from "../rollers/followers";
+  import { RerolledEvent } from "../types/RerolledEvent";
+  import CardButtons from "./CardTitleButtons.svelte";
 
+  const dispatch = createEventDispatcher();
   export let follower: Follower;
-  export let timestamp: string;
+  export let timestamp: string = "";
+  export let showRemove: boolean = true;
+
+  function reroll() {
+    follower = rollFollower();
+    dispatch("rerolled", new RerolledEvent("follower", follower));
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
 </script>
 
 <main>
   <Card class="mb-3">
     <CardHeader>
-      <CardTitle>{follower.name} ({follower.gender})</CardTitle>
+      <CardTitle>
+        <div class="title">
+          <div class="description">
+            Follower: {follower.name} ({follower.gender})
+          </div>
+          <CardButtons data={follower} dataType="follower" on:reroll={reroll} {showRemove} on:remove={remove} />
+        </div>
+      </CardTitle>
     </CardHeader>
     <CardBody>
       <CardSubtitle>
@@ -88,7 +109,9 @@
         </Container>
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
@@ -96,6 +119,10 @@
   main {
     text-align: left;
   }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
   p {
     margin-left: 1em;
   }
diff --git a/src/components/KingdomCard.svelte b/src/components/KingdomCard.svelte
index d9c0577..8bd4390 100644
--- a/src/components/KingdomCard.svelte
+++ b/src/components/KingdomCard.svelte
@@ -1,12 +1,25 @@
 <script lang="ts">
-  import { capitalize } from "lodash";
+  import { createEventDispatcher } from "svelte";
+  import { capitalize, sample } from "lodash";
   import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter, Icon } from "sveltestrap";
-  import type { Kingdom, KingdomItem } from "../rollers/kingdoms";
+  import type { KingdomItem } from "../rollers/kingdoms";
+  import CardButtons from "./CardTitleButtons.svelte";
+  import { RerolledEvent } from "../types/RerolledEvent";
 
+  const dispatch = createEventDispatcher();
   export let item: KingdomItem;
   export let timestamp: string;
   let icon = "";
 
+  function reroll() {
+    item.description = sample(item.kingdom[item.category]);
+    dispatch("rerolled", new RerolledEvent("kingdomItem-" + item.category, item.description));
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
+
   $: icon = String({ male: "person-fill", female: "person", steading: "house-door-fill", mount: "bicycle" }[item?.category] || "");
 </script>
 
@@ -14,18 +27,32 @@
   <Card class="mb-3">
     <CardHeader>
       <CardTitle>
-        {capitalize(item.category)} from {item.kingdom.description}
+        <div class="title">
+          <div class="description">
+            {capitalize(item.category)} from {item.kingdom.description}
+          </div>
+          <CardButtons data={item.description} dataType={"kingdomItem." + item?.category} on:reroll={reroll} on:remove={remove} />
+        </div>
       </CardTitle>
     </CardHeader>
     <CardBody>
       <CardText>
-        <Icon name={icon} />
+        Name: <Icon name={icon} />
         {item.description}
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
 <style>
+  main {
+    text-align: left;
+  }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
 </style>
diff --git a/src/components/MultiCard.svelte b/src/components/MultiCard.svelte
index 2d8b942..c97b946 100644
--- a/src/components/MultiCard.svelte
+++ b/src/components/MultiCard.svelte
@@ -14,10 +14,15 @@
   import SteadingCard from "./SteadingCard.svelte";
 
   import type { RollCard } from "../types/RollCard";
+  import type { RerolledEvent } from "../types/RerolledEvent";
 
   const dispatch = createEventDispatcher();
   export let card: RollCard;
 
+  function rerolled(event: CustomEvent<RerolledEvent>) {
+    // pass along the event
+    dispatch("rerolled", event.detail);
+  }
   function remove() {
     dispatch("remove", card);
   }
@@ -25,27 +30,27 @@
 
 <main>
   {#if card.type == "creature"}
-    <CreatureCard creature={card.value} timestamp={card.timestamp} on:remove={remove} />
+    <CreatureCard creature={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else if card.type == "danger"}
-    <DangerCard danger={card.value} timestamp={card.timestamp} />
+    <DangerCard danger={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else if card.type == "detail"}
-    <DetailsCard detail={card.value} timestamp={card.timestamp} />
+    <DetailsCard detail={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else if card.type == "discovery"}
-    <DiscoveryCard discovery={card.value} timestamp={card.timestamp} />
+    <DiscoveryCard discovery={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else if card.type == "dungeon"}
-    <DungeonCard dungeon={card.value} timestamp={card.timestamp} />
+    <DungeonCard dungeon={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else if card.type == "follower"}
-    <FollowerCard follower={card.value} timestamp={card.timestamp} />
+    <FollowerCard follower={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else if card.type == "kingdom"}
-    <KingdomCard item={card.value} timestamp={card.timestamp} />
+    <KingdomCard item={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else if card.type == "npc"}
-    <NpcCard npc={card.value} timestamp={card.timestamp} />
+    <NpcCard npc={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else if card.type == "place"}
-    <PlaceCard place={card.value} timestamp={card.timestamp} />
+    <PlaceCard place={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else if card.type == "region"}
-    <RegionCard region={card.value} timestamp={card.timestamp} />
+    <RegionCard region={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else if card.type == "steading"}
-    <SteadingCard steading={card.value} timestamp={card.timestamp} />
+    <SteadingCard steading={card.value} timestamp={card.timestamp} on:rerolled={rerolled} on:remove={remove} />
   {:else}
     <h3>Card type not supported: {card.type}</h3>
   {/if}
diff --git a/src/components/NpcCard.svelte b/src/components/NpcCard.svelte
index 609a667..991bfe4 100644
--- a/src/components/NpcCard.svelte
+++ b/src/components/NpcCard.svelte
@@ -1,15 +1,51 @@
 <script lang="ts">
-  import { Card, CardHeader, CardTitle, CardBody, CardSubtitle, CardText, CardFooter, Container, Col, Row, Icon } from "sveltestrap";
-  import type { Npc } from "../rollers/npcs";
+  import { createEventDispatcher } from "svelte";
+  import {
+    Accordion,
+    AccordionItem,
+    Card,
+    CardHeader,
+    CardTitle,
+    CardBody,
+    CardSubtitle,
+    CardText,
+    CardFooter,
+    Container,
+    Col,
+    Row,
+    Icon,
+  } from "sveltestrap";
+  import { Npc, rollNpc } from "../rollers/npcs";
+  import FollowerCard from "./FollowerCard.svelte";
+  import CardButtons from "./CardTitleButtons.svelte";
+  import { RerolledEvent } from "../types/RerolledEvent";
 
+  const dispatch = createEventDispatcher();
   export let npc: Npc;
-  export let timestamp: string;
+  export let timestamp: string = "";
+  export let showRemove: boolean = true;
+
+  function reroll() {
+    npc = rollNpc();
+    dispatch("rerolled", new RerolledEvent("npc", npc));
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
 </script>
 
 <main>
   <Card class="mb-3">
     <CardHeader>
-      <CardTitle>{npc.getDescription()}</CardTitle>
+      <CardTitle>
+        <div class="title">
+          <div class="description">
+            NPC: {npc.getDescription()}
+          </div>
+          <CardButtons data={npc} dataType="npc" on:reroll={reroll} {showRemove} on:remove={remove} />
+        </div></CardTitle
+      >
     </CardHeader>
     <CardBody>
       <CardSubtitle>
@@ -22,21 +58,24 @@
             <ul>
               <li>
                 They are a(n) <em>{npc.context.alignment.description}</em> <em>{npc.context.description}</em> with
-                <em>{npc.trait.category} ({npc.context.trait.description})</em>
+                <em>{npc.traits[0]?.category} ({npc.context.trait.description})</em>
                 encountered in a(n) <em>{npc.context.category}</em> setting while they are <em>{npc.context.activity.description}</em>
               </li>
             </ul>
           </Row>
-          <Row>
-            <strong>Follower Stats:</strong>
-            <ul>
-              <li>{npc.follower.name}</li>
-            </ul>
-          </Row>
+          <!-- <Row>
+            <Accordion>
+              <AccordionItem header="Follower Stats">
+                <FollowerCard follower={npc.follower} showRemove={false} />
+              </AccordionItem>
+            </Accordion>
+          </Row> -->
         </Container>
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
@@ -44,6 +83,10 @@
   main {
     text-align: left;
   }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
   ul {
     margin-left: 2em;
   }
diff --git a/src/components/PlaceCard.svelte b/src/components/PlaceCard.svelte
index 11604fc..d223e51 100644
--- a/src/components/PlaceCard.svelte
+++ b/src/components/PlaceCard.svelte
@@ -1,24 +1,52 @@
 <script lang="ts">
+  import { createEventDispatcher } from "svelte";
   import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter } from "sveltestrap";
   import type { Place } from "../rollers/places";
+  import { rollPlace } from "../rollers/places";
+  import { RerolledEvent } from "../types/RerolledEvent";
+  import CardButtons from "./CardTitleButtons.svelte";
 
+  const dispatch = createEventDispatcher();
   export let place: Place;
   export let timestamp: string;
+
+  function reroll() {
+    place = rollPlace();
+    dispatch("rerolled", new RerolledEvent("place", place));
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
 </script>
 
 <main>
   <Card class="mb-3">
     <CardHeader>
-      <CardTitle>Place</CardTitle>
+      <CardTitle>
+        <div class="title">
+          <div class="description">Place</div>
+          <CardButtons data={place} dataType="place" on:reroll={reroll} on:remove={remove} />
+        </div>
+      </CardTitle>
     </CardHeader>
     <CardBody>
       <CardText>
-        {place}
+        Name: {place}
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
 <style>
+  main {
+    text-align: left;
+  }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
 </style>
diff --git a/src/components/RegionCard.svelte b/src/components/RegionCard.svelte
index 2117600..d3e8fa2 100644
--- a/src/components/RegionCard.svelte
+++ b/src/components/RegionCard.svelte
@@ -1,24 +1,52 @@
 <script lang="ts">
+  import { createEventDispatcher } from "svelte";
   import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter } from "sveltestrap";
   import type { Region } from "../rollers/regions";
+  import { rollRegion } from "../rollers/regions";
+  import { RerolledEvent } from "../types/RerolledEvent";
+  import CardButtons from "./CardTitleButtons.svelte";
 
+  const dispatch = createEventDispatcher();
   export let region: Region;
   export let timestamp: string;
+
+  function reroll() {
+    region = rollRegion();
+    dispatch("rerolled", new RerolledEvent("region", region));
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
 </script>
 
 <main>
   <Card class="mb-3">
     <CardHeader>
-      <CardTitle>Region</CardTitle>
+      <CardTitle>
+        <div class="title">
+          <div class="description">Region</div>
+          <CardButtons data={region} dataType="region" on:reroll={reroll} on:remove={remove} />
+        </div>
+      </CardTitle>
     </CardHeader>
     <CardBody>
       <CardText>
-        {region}
+        Name: {region}
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
 <style>
+  main {
+    text-align: left;
+  }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
 </style>
diff --git a/src/components/SteadingCard.svelte b/src/components/SteadingCard.svelte
index 7a0879b..ad36217 100644
--- a/src/components/SteadingCard.svelte
+++ b/src/components/SteadingCard.svelte
@@ -1,32 +1,48 @@
 <script lang="ts">
-  import { Button, Card, CardHeader, CardTitle, CardBody, CardSubtitle, CardText, CardFooter, Container, Row, Icon } from "sveltestrap";
+  import { createEventDispatcher } from "svelte";
+  import { Card, CardHeader, CardTitle, CardBody, CardSubtitle, CardText, CardFooter, Container, Row } from "sveltestrap";
   import { capitalize } from "lodash";
 
   import DieIcon from "./DieIcon.svelte";
   import CreatureCard from "./CreatureCard.svelte";
-  import type { Steading } from "../rollers/steadings";
+  import { rollSteading, Steading } from "../rollers/steadings";
+  import CardButtons from "./CardTitleButtons.svelte";
+  import { RerolledEvent } from "../types/RerolledEvent";
 
+  const dispatch = createEventDispatcher();
   export let steading: Steading;
-  export let timestamp: string;
+  export let timestamp: string = "";
+  export let showRemove: boolean = true;
+
+  function reroll() {
+    steading = rollSteading();
+    dispatch("rerolled", new RerolledEvent("steading", steading));
+  }
+
+  function remove() {
+    dispatch("remove");
+  }
 </script>
 
 <main>
   <Card class="mb-3">
     <CardHeader>
       <CardTitle>
-        {capitalize(steading.category)}
-        <DieIcon value={steading.roll} />
+        <div class="title">
+          <div class="description">Steading: {capitalize(steading.category)}<DieIcon value={steading.roll} /></div>
+          <CardButtons data={steading} dataType="steading" on:reroll={reroll} {showRemove} on:remove={remove} />
+        </div>
       </CardTitle>
     </CardHeader>
     <CardBody>
       <CardText>
         <Container>
           <Row>
-            <h3>Built by:</h3>
-            <CreatureCard creature={steading.builtBy} {timestamp} />
+            <h4>Built by:</h4>
+            <CreatureCard creature={steading.builtBy} showRemove={false} />
           </Row>
           <Row>
-            <h3>Tags</h3>
+            <h4>Tags</h4>
             <ul>
               {#each steading.tags as tag}
                 <li>{tag}</li>
@@ -34,7 +50,7 @@
             </ul>
           </Row>
           <Row>
-            <h3>{capitalize(steading.condition)}:</h3>
+            <h4>{capitalize(steading.condition)}:</h4>
           </Row>
           <Row>
             <h4>{capitalize(steading.benefit.description)} <DieIcon value={steading.benefitRoll} />:</h4>
@@ -55,7 +71,9 @@
         </Container>
       </CardText>
     </CardBody>
-    <CardFooter>{timestamp}</CardFooter>
+    {#if timestamp}
+      <CardFooter>{timestamp}</CardFooter>
+    {/if}
   </Card>
 </main>
 
@@ -63,6 +81,10 @@
   main {
     text-align: left;
   }
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
   ul {
     margin-left: 2em;
   }
diff --git a/src/components/SteadingRoller.svelte b/src/components/SteadingRoller.svelte
index d6b3179..2303b2d 100644
--- a/src/components/SteadingRoller.svelte
+++ b/src/components/SteadingRoller.svelte
@@ -1,29 +1,18 @@
 <script lang="ts">
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
   import { Button } from "sveltestrap";
-  import SteadingCard from "./SteadingCard.svelte";
-  import { rollSteading, Steading } from "../rollers/steadings";
+  import { rollSteading } from "../rollers/steadings";
 
   const dispatch = createEventDispatcher();
 
-  export let rollResults: { steading: Steading; timestamp: string }[] = [];
-
   function roll(event: Event) {
     let steading = rollSteading();
-    rollResults = [{ steading, timestamp: formatDate(new Date(), "P kk:mm:ss") }, ...rollResults];
-    dispatch("roll");
+    dispatch("roll", { type: "steading", value: steading });
   }
 </script>
 
 <main>
-  <span class="btn">
-    <Button color="primary" on:click={roll}>Roll Steading</Button>
-  </span>
-
-  {#each rollResults as { steading, timestamp }}
-    <SteadingCard {steading} {timestamp} />
-  {/each}
+  <Button color="primary" on:click={roll}>Roll Steading</Button>
 </main>
 
 <style>
diff --git a/src/rollers/details.ts b/src/rollers/details.ts
index 557dd26..26feb98 100644
--- a/src/rollers/details.ts
+++ b/src/rollers/details.ts
@@ -1,13 +1,41 @@
 import { random, replace, sample, sampleSize } from "lodash";
 
+export type DetailType = "ability" | "activity" | "adjective" | "age" | "alignment" | "aspect" | "condition" | "disposition" | "element" |
+  "feature" | "magic type" | "num appearing" | "oddity" | "orientation" | "ruination" | "size" | "tag" | "terrain" | "visibility";
+
 // This is the general implemenetation of details.
 // We are not doing strict class inheritance because that way leads to pain
 export class Detail {
-  constructor(public type: string, public roll: number, public description: string) { }
+  constructor(public type: DetailType, public roll: number, public description: string) { }
+}
+
+export function rollDetail(type: DetailType): { type: DetailType, roll: number, description: string } {
+  switch (type) {
+    case "ability": return rollAbility();
+    case "activity": return rollActivity();
+    case "adjective": return rollAdjective();
+    case "age": return rollAge();
+    case "alignment": return rollAlignment();
+    case "aspect": return rollAspect();
+    case "condition": return rollCondition();
+    case "disposition": return rollDisposition();
+    case "element": return rollElement();
+    case "feature": return rollFeature();
+    case "magic type": return rollMagicType();
+    case "num appearing": return rollNumAppearing();
+    case "oddity": return rollOddity();
+    case "orientation": return rollOrientation();
+    case "ruination": return rollRuination();
+    case "size": return rollSize();
+    case "tag": return rollTag();
+    case "terrain": return rollTerrain();
+    case "visibility": return rollVisibility();
+    default: return { type: type, roll: 0, description: "invalid type" };
+  }
 }
 
 export class Ability {
-  type: string = "ability";
+  type: DetailType = "ability";
   constructor(public roll: number = 0, public description = "") { };
 }
 
@@ -33,7 +61,7 @@ export function rollAbility(roll: number = random(1, 12)): Ability {
 }
 
 export class Activity {
-  type: string = "activity";
+  type: DetailType = "activity";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -58,7 +86,7 @@ export function rollActivity(roll: number = random(1, 12)): Activity {
 }
 
 export class Adjective {
-  type: string = "adjective";
+  type: DetailType = "adjective";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -83,7 +111,7 @@ export function rollAdjective(roll: number = random(1, 12)): Adjective {
 }
 
 export class Age {
-  type: string = "age";
+  type: DetailType = "age";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -108,7 +136,7 @@ export function rollAge(roll: number = random(1, 12)): Age {
 }
 
 export class Alignment {
-  type: string = "alignment";
+  type: DetailType = "alignment";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -131,7 +159,7 @@ export function rollAlignment(roll: number = random(1, 12)): Alignment {
 }
 
 export class Aspect {
-  type: string = "aspect";
+  type: DetailType = "aspect";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -157,7 +185,7 @@ export function rollAspect(roll: number = random(1, 12)): Aspect {
 }
 
 export class Condition {
-  type: string = "condition";
+  type: DetailType = "condition";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -184,7 +212,7 @@ export function rollCondition(roll: number = random(1, 12)): Condition {
 }
 
 export class Disposition {
-  type: string = "disposition";
+  type: DetailType = "disposition";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -211,7 +239,7 @@ export function rollDisposition(roll: number = random(1, 12)): Disposition {
 }
 
 export class Element {
-  type: string = "element";
+  type: DetailType = "element";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -236,7 +264,7 @@ export function rollElement(roll: number = random(1, 12)): Element {
 }
 
 export class Feature {
-  type: string = "feature";
+  type: DetailType = "feature";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -271,7 +299,7 @@ export function rollFeature(roll: number = random(1, 12)): Feature {
 }
 
 export class MagicType {
-  type: string = "magic type";
+  type: DetailType = "magic type";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -295,7 +323,7 @@ export function rollMagicType(roll: number = random(1, 12)): MagicType {
 }
 
 export class NumAppearing {
-  type: string = "num appearing";
+  type: DetailType = "num appearing";
   constructor(public roll: number = 0, public description: string = "", public count: string = "") { };
 }
 
@@ -316,7 +344,7 @@ export function rollNumAppearing(roll: number = random(1, 12)): NumAppearing {
 }
 
 export class Oddity {
-  type: string = "oddity";
+  type: DetailType = "oddity";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -342,7 +370,7 @@ export function rollOddity(roll: number = random(1, 12)): Oddity {
 }
 
 export class Orientation {
-  type: string = "orientation";
+  type: DetailType = "orientation";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -375,7 +403,7 @@ export function rollOrientation(roll: number = random(1, 12)): Orientation {
 }
 
 export class Ruination {
-  type: string = "ruination";
+  type: DetailType = "ruination";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -404,7 +432,7 @@ export function rollRuination(roll: number = random(1, 12)): Ruination {
 }
 
 export class Size {
-  type: string = "size";
+  type: DetailType = "size";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -427,7 +455,7 @@ export function rollSize(roll: number = random(1, 12)): Size {
 }
 
 export class Tag {
-  type: string = "tag";
+  type: DetailType = "tag";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -461,7 +489,7 @@ export function rollTag(roll: number = random(1, 12)) {
 }
 
 export class Terrain {
-  type: string = "terrain";
+  type: DetailType = "terrain";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
@@ -488,7 +516,7 @@ export function rollTerrain(roll: number = random(1, 12)): Terrain {
 }
 
 export class Visibility {
-  type: string = "visibility";
+  type: DetailType = "visibility";
   constructor(public roll: number = 0, public description: string = "") { };
 }
 
diff --git a/src/rollers/npcs.ts b/src/rollers/npcs.ts
index f3ecd43..c0ca660 100644
--- a/src/rollers/npcs.ts
+++ b/src/rollers/npcs.ts
@@ -10,7 +10,7 @@ export class Npc {
   hometown: string;
   context: Context;
   occupation: Occupation
-  trait: Trait;
+  traits: Trait[];
   follower: Follower;
 
   getDescription(fullDesc: boolean = false) {
@@ -32,7 +32,7 @@ export function rollNpc(): Npc {
 
   npc.context = rollContext();
   npc.occupation = rollOccupation();
-  npc.trait = rollTrait();
+  npc.traits.push(rollTrait());
   npc.follower = rollFollower();
 
   return npc;
diff --git a/src/types/RerolledEvent.ts b/src/types/RerolledEvent.ts
new file mode 100644
index 0000000..5760e54
--- /dev/null
+++ b/src/types/RerolledEvent.ts
@@ -0,0 +1,3 @@
+export class RerolledEvent {
+  constructor(public type: string, public value: any) { };
+}
\ No newline at end of file