diff --git a/app/server.R b/app/server.R
index 6cf6fcf..5a80fa7 100644
--- a/app/server.R
+++ b/app/server.R
@@ -5,27 +5,22 @@ server <- function(input, output, session) {
   })
 
   storm_coverage <- get_storm_data_coverage() %>%
-    select(-storm_basin) %>%
-    {
-      col_names <- names(.)
-      mutate(
-        .,
-        data = trimws(paste(
-          "<span class=\"badge bg-primary\">HURDAT2</span>",
-          ifelse(
-            as.logical(.data[[col_names[3]]]),
-            "<span class=\"badge bg-danger\">Fatality</span>",
-            ""
-          ),
-          ifelse(
-            as.logical(.data[[col_names[4]]]),
-            "<span class=\"badge bg-success\">Cost</span>",
-            ""
-          )
-        ))
-      ) %>%
-        select(1, 2, data)
-    }
+    mutate(
+      data = trimws(paste(
+        "<span class=\"badge bg-primary\">HURDAT2</span>",
+        ifelse(
+          as.logical(has_fatality_data),
+          "<span class=\"badge bg-danger\">Fatality</span>",
+          ""
+        ),
+        ifelse(
+          as.logical(has_cost_data),
+          "<span class=\"badge bg-success\">Cost</span>",
+          ""
+        )
+      ))
+    ) %>%
+    select(hurdatid, storm_name, storm_year, data, mmh, mmp, total)
 
   output$dt_storm_badges <- renderUI({
     div(HTML(dt_storm_selected()$data))
@@ -37,7 +32,15 @@ server <- function(input, output, session) {
       fillContainer = TRUE,
       rownames = F,
       escape = F,
-      colnames = c("Year", "Name", "Data"),
+      colnames = c(
+        "HURDAT2 ID",
+        "Storm Name",
+        "Year",
+        "Available Data",
+        "MMH23",
+        "MMP23",
+        "Direct Deaths"
+      ),
       selection = "single",
       options = list(
         pageLength = 1000,
@@ -47,7 +50,8 @@ server <- function(input, output, session) {
         info = F,
         lengthChange = F
       )
-    )
+    ) %>%
+      formatCurrency(c("mmh", "mmp"), "$", digits = 0)
   })
 
   dt_storm_selected <- reactive({