Update app.R

app.R

@@ -163,6 +163,24 @@ app_css <- "
 # ======================  HITTER CODE (VERBATIM)  ======================
 # =====================================================================
 
+tableau_pitch_colors <- c(
+  # Primary pitches from screenshots
+  "Sinker" = "#5DADE2",      # Teal/Cyan
+  "Slider" = "#E67E22",      # Orange
+  "Cutter" = "#F4D03F",      # Yellow/Gold
+  "Sweeper" = "#E67E22",     # Same as Slider
+  
+  # Other pitch types (standard colors)
+  "Fastball" = "#E74C3C",    # Red
+  "Four-Seam" = "#E74C3C",
+  "FourSeamFastBall" = "#E74C3C",
+  "Curveball" = "#9B59B6",   # Purple
+  "ChangeUp" = "#2ECC71",    # Green
+  "Splitter" = "#1ABC9C",    # Teal-green
+  "Knuckle Curve" = "#8E44AD",
+  "Other" = "#95A5A6"        # Gray
+)
+
 process_dataset <- function(df) {
   if ("Batter" %in% names(df)) {
     df <- df %>% mutate(Batter = stringr::str_replace(Batter, "^\\s*(\\w+)\\s*,\\s*(\\w+)\\s*$", "\\2 \\1"))
@@ -1072,25 +1090,24 @@ create_postgame_pdf <- function(game_df, player_name, output_file, bio_data = NU
 # TABLEAU-STYLE PITCHER REPORT FUNCTIONS
 # =====================================================================
 
-tableau_pitch_colors <- c(
-  "Fastball" = "#FA8072", "FourSeamFastBall" = "#FA8072", "Four-Seam" = "#FA8072",
-  "Sinker" = "#F2A541", "Slider" = "#9B59B6", "Sweeper" = "#9B59B6",
-  "Curveball" = "#2c7bb6", "ChangeUp" = "#90EE90", "Splitter" = "#90EE32",
-  "Cutter" = "#1ABC9C"
-)
-
 process_tableau_pitcher_data <- function(df) {
+  # Standardize Pitcher name
   if (!"Pitcher" %in% names(df)) {
     alt <- intersect(c("PitcherName","pitcher","Pitcher_LastFirst","PlayerName"), names(df))
     if (length(alt)) df$Pitcher <- df[[alt[1]]] else df$Pitcher <- NA_character_
   }
+  
   df <- df %>%
-    mutate(Pitcher = stringr::str_replace(coalesce(Pitcher, ""), "^\\s*(\\w+)\\s*,\\s*(\\w+)\\s*$", "\\2 \\1"))
+    mutate(Pitcher = str_replace(coalesce(Pitcher, ""), "^\\s*(\\w+)\\s*,\\s*(\\w+)\\s*$", "\\2 \\1"))
   
+  # Calculate all indicators
   df <- df %>%
     mutate(
+      # Strike Zone Indicator (standard zone)
       StrikeZoneIndicator = ifelse(PlateLocSide >= -0.8333 & PlateLocSide <= 0.8333 & 
-                                     PlateLocHeight >= 1.5 & PlateLocHeight <= 3.37467, 1, 0),
+                                     PlateLocHeight >= 1.5 & PlateLocHeight <= 3.5, 1, 0),
+      
+      # Edge calculations
       EdgeHeightIndicator = ifelse((PlateLocHeight > 14/12 & PlateLocHeight < 22/12) |
                                      (PlateLocHeight > 38/12 & PlateLocHeight < 46/12), 1, 0),
       EdgeZoneHtIndicator = ifelse(PlateLocHeight > 16/12 & PlateLocHeight < 45.2/12, 1, 0),
@@ -1099,68 +1116,135 @@ process_tableau_pitcher_data <- function(df) {
                                     (PlateLocSide < 13.3/12 & PlateLocSide > 6.7/12), 1, 0),
       EdgeIndicator = ifelse((EdgeHeightIndicator == 1 & EdgeZoneWIndicator == 1) | 
                                (EdgeWidthIndicator == 1 & EdgeZoneHtIndicator == 1), 1, 0),
+      
+      # Quality pitch (zone or edge)
       QualityPitchIndicator = ifelse(StrikeZoneIndicator == 1 | EdgeIndicator == 1, 1, 0),
-      StrikeIndicator = ifelse(PitchCall %in% c("StrikeSwinging", "StrikeCalled", "FoulBallNotFieldable", "FoulBall", "InPlay"), 1, 0),
+      
+      # Strike/Ball indicators
+      StrikeIndicator = ifelse(PitchCall %in% c("StrikeSwinging", "StrikeCalled", 
+                                                  "FoulBallNotFieldable", "FoulBall", "InPlay"), 1, 0),
       WhiffIndicator = ifelse(PitchCall == "StrikeSwinging", 1, 0),
-      SwingIndicator = ifelse(PitchCall %in% c("StrikeSwinging", "FoulBallNotFieldable", "FoulBall", "InPlay"), 1, 0),
+      SwingIndicator = ifelse(PitchCall %in% c("StrikeSwinging", "FoulBallNotFieldable", 
+                                                 "FoulBall", "InPlay"), 1, 0),
+      
+      # First pitch indicators
       FPindicator = ifelse(Balls == 0 & Strikes == 0, 1, 0),
-      FPSindicator = ifelse(PitchCall %in% c("StrikeCalled", "StrikeSwinging", "FoulBallNotFieldable", "FoulBall", "InPlay") & FPindicator == 1, 1, 0),
-      AheadIndicator = ifelse(((Balls == 0 & Strikes == 1) | (Balls == 1 & Strikes == 1)) & StrikeIndicator == 1, 1, 0),
-      ABindicator = ifelse(PlayResult %in% c("Error", "FieldersChoice", "Out", "Single", "Double", "Triple", "HomeRun") | KorBB == "Strikeout", 1, 0),
+      FPSindicator = ifelse(PitchCall %in% c("StrikeCalled", "StrikeSwinging", 
+                                               "FoulBallNotFieldable", "FoulBall", "InPlay") & 
+                              FPindicator == 1, 1, 0),
+      
+      # Ahead indicator (0-1 or 1-1 count, got strike)
+      AheadIndicator = ifelse(((Balls == 0 & Strikes == 1) | (Balls == 1 & Strikes == 1)) & 
+                                StrikeIndicator == 1, 1, 0),
+      
+      # At-bat indicator
+      ABindicator = ifelse(PlayResult %in% c("Error", "FieldersChoice", "Out", 
+                                               "Single", "Double", "Triple", "HomeRun") | 
+                             KorBB == "Strikeout", 1, 0),
+      
+      # Hit indicator
       HitIndicator = ifelse(PlayResult %in% c("Single", "Double", "Triple", "HomeRun"), 1, 0),
-      PAindicator = ifelse(PitchCall %in% c("InPlay", "HitByPitch", "CatchersInterference") | KorBB %in% c("Walk", "Strikeout"), 1, 0),
-      LeadOffIndicator = ifelse((PAofInning == 1 & (PlayResult != "Undefined" | KorBB != "Undefined")) | PitchCall == "HitByPitch", 1, 0),
-      OutIndicator = ifelse((PlayResult %in% c("Out", "FieldersChoice") | KorBB == "Strikeout") & PitchCall != "HitByPitch", 1, 0),
+      
+      # Plate appearance indicator
+      PAindicator = ifelse(PitchCall %in% c("InPlay", "HitByPitch", "CatchersInterference") | 
+                             KorBB %in% c("Walk", "Strikeout"), 1, 0),
+      
+      # Leadoff indicators
+      LeadOffIndicator = ifelse((PAofInning == 1 & (PlayResult != "Undefined" | KorBB != "Undefined")) | 
+                                  PitchCall == "HitByPitch", 1, 0),
+      OutIndicator = ifelse((PlayResult %in% c("Out", "FieldersChoice") | KorBB == "Strikeout") & 
+                              PitchCall != "HitByPitch", 1, 0),
       LOOindicator = ifelse(LeadOffIndicator == 1 & OutIndicator == 1, 1, 0),
+      
+      # Walk/HBP indicators
       HBPIndicator = ifelse(PitchCall == "HitByPitch", 1, 0),
       WalkIndicator = ifelse(KorBB == "Walk", 1, 0),
+      
+      # Batter side indicators
       LHHindicator = ifelse(BatterSide == "Left", 1, 0),
       RHHindicator = ifelse(BatterSide == "Right", 1, 0)
     )
+  
   df
 }
 
 calculate_tableau_header_stats <- function(pitcher_df) {
-  ab_data <- pitcher_df %>% filter(ABindicator == 1) %>%
-    group_by(Inning, Batter, PAofInning) %>% slice_tail(n = 1) %>% ungroup()
+  # At-bats (unique AB-ending events)
+  ab_data <- pitcher_df %>% 
+    filter(ABindicator == 1) %>%
+    group_by(Inning, Batter, PAofInning) %>% 
+    slice_tail(n = 1) %>% 
+    ungroup()
   
   at_bats <- nrow(ab_data)
   hits <- sum(ab_data$HitIndicator, na.rm = TRUE)
   xbh <- sum(ab_data$PlayResult %in% c("Double", "Triple", "HomeRun"), na.rm = TRUE)
   runs <- sum(pitcher_df$RunsScored, na.rm = TRUE)
   
-  pa_data <- pitcher_df %>% filter(PAindicator == 1) %>%
-    group_by(Inning, Batter, PAofInning) %>% slice_tail(n = 1) %>% ungroup()
+  # Plate appearances
+  pa_data <- pitcher_df %>% 
+    filter(PAindicator == 1) %>%
+    group_by(Inning, Batter, PAofInning) %>% 
+    slice_tail(n = 1) %>% 
+    ungroup()
   
   bb <- sum(pa_data$WalkIndicator, na.rm = TRUE)
   hbp <- sum(pa_data$HBPIndicator, na.rm = TRUE)
   so <- sum(pa_data$KorBB == "Strikeout", na.rm = TRUE)
+  
+  # Batting average
   avg <- ifelse(at_bats > 0, round(hits / at_bats, 3), 0)
   
+  # Percentage stats
   total_pitches <- nrow(pitcher_df)
-  strike_pct <- ifelse(total_pitches > 0, round(100 * sum(pitcher_df$StrikeIndicator, na.rm = TRUE) / total_pitches, 0), 0)
+  strike_pct <- ifelse(total_pitches > 0, 
+                       round(100 * sum(pitcher_df$StrikeIndicator, na.rm = TRUE) / total_pitches, 0), 0)
+  
   fp_pitches <- sum(pitcher_df$FPindicator, na.rm = TRUE)
-  fp_k_pct <- ifelse(fp_pitches > 0, round(100 * sum(pitcher_df$FPSindicator, na.rm = TRUE) / fp_pitches, 0), 0)
-  ea_pct <- ifelse(fp_pitches > 0, round(100 * (sum(pitcher_df$FPSindicator, na.rm = TRUE) + sum(pitcher_df$AheadIndicator & pitcher_df$Balls == 0, na.rm = TRUE)) / fp_pitches, 0), 0)
-  comp_pct <- ifelse(total_pitches > 0, round(100 * sum(pitcher_df$QualityPitchIndicator, na.rm = TRUE) / total_pitches, 0), 0)
+  fp_k_pct <- ifelse(fp_pitches > 0, 
+                     round(100 * sum(pitcher_df$FPSindicator, na.rm = TRUE) / fp_pitches, 0), 0)
+  
+  # E+A% = (FPS + Ahead pitches) / First pitches
+  ea_pct <- ifelse(fp_pitches > 0, 
+                   round(100 * (sum(pitcher_df$FPSindicator, na.rm = TRUE) + 
+                                  sum(pitcher_df$AheadIndicator & pitcher_df$Balls == 0, na.rm = TRUE)) / fp_pitches, 0), 0)
+  
+  # Comp% = Quality pitches / Total pitches
+  comp_pct <- ifelse(total_pitches > 0, 
+                     round(100 * sum(pitcher_df$QualityPitchIndicator, na.rm = TRUE) / total_pitches, 0), 0)
+  
+  # LOO% = Leadoff outs / Leadoff opportunities
   leadoff_opps <- sum(pitcher_df$LeadOffIndicator, na.rm = TRUE)
-  loo_pct <- ifelse(leadoff_opps > 0, round(100 * sum(pitcher_df$LOOindicator, na.rm = TRUE) / leadoff_opps, 0), 0)
+  loo_pct <- ifelse(leadoff_opps > 0, 
+                    round(100 * sum(pitcher_df$LOOindicator, na.rm = TRUE) / leadoff_opps, 0), 0)
   
-  list(at_bats = at_bats, hits = hits, xbh = xbh, runs = runs, bb_hbp = bb + hbp, so = so,
-       avg = sprintf("%.3f", avg), strike_pct = paste0(strike_pct, "%"), fp_k_pct = paste0(fp_k_pct, "%"),
-       ea_pct = paste0(ea_pct, "%"), comp_pct = paste0(comp_pct, "%"), loo_pct = paste0(loo_pct, "%"))
+  list(
+    at_bats = at_bats,
+    hits = hits,
+    xbh = xbh,
+    runs = runs,
+    bb_hbp = bb + hbp,
+    so = so,
+    avg = sprintf("%.3f", avg),
+    strike_pct = paste0(strike_pct, "%"),
+    fp_k_pct = paste0(fp_k_pct, "%"),
+    ea_pct = paste0(ea_pct, "%"),
+    comp_pct = paste0(comp_pct, "%"),
+    loo_pct = paste0(loo_pct, "%")
+  )
 }
 
 calculate_tableau_location_data <- function(pitcher_df) {
   pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "Other") %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other") %>%
     group_by(TaggedPitchType) %>%
     summarise(
-      `Zone%` = round(100 * sum(StrikeZoneIndicator, na.rm = TRUE) / n(), 0),
-      `Edge%` = round(100 * sum(EdgeIndicator, na.rm = TRUE) / n(), 0),
-      `Strike%` = round(100 * sum(StrikeIndicator, na.rm = TRUE) / n(), 0),
+      `Zone%` = paste0(round(100 * sum(StrikeZoneIndicator, na.rm = TRUE) / n(), 0), "%"),
+      `Edge%` = paste0(round(100 * sum(EdgeIndicator, na.rm = TRUE) / n(), 0), "%"),
+      `Strike%` = paste0(round(100 * sum(StrikeIndicator, na.rm = TRUE) / n(), 0), "%"),
       `Whiff%` = ifelse(sum(SwingIndicator, na.rm = TRUE) > 0,
-                        round(100 * sum(WhiffIndicator, na.rm = TRUE) / sum(SwingIndicator, na.rm = TRUE), 0), 0),
+                        paste0(round(100 * sum(WhiffIndicator, na.rm = TRUE) / sum(SwingIndicator, na.rm = TRUE), 0), "%"),
+                        "0%"),
       .groups = "drop"
     )
 }
@@ -1170,7 +1254,7 @@ calculate_tableau_pitch_usage <- function(pitcher_df) {
   rhh_pitches <- sum(pitcher_df$RHHindicator, na.rm = TRUE)
   
   pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "Other") %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other") %>%
     group_by(TaggedPitchType) %>%
     summarise(
       `Pitch Count` = n(),
@@ -1182,7 +1266,7 @@ calculate_tableau_pitch_usage <- function(pitcher_df) {
 
 calculate_tableau_velo_movement <- function(pitcher_df) {
   pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "Other") %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other") %>%
     group_by(TaggedPitchType) %>%
     summarise(
       `Avg. Velo` = round(mean(RelSpeed, na.rm = TRUE), 1),
@@ -1196,280 +1280,489 @@ calculate_tableau_velo_movement <- function(pitcher_df) {
 }
 
 calculate_tableau_release_data <- function(pitcher_df) {
-  primary <- pitcher_df %>% filter(TaggedPitchType %in% c("Fastball", "Sinker", "Four-Seam", "FourSeamFastBall"))
+  # Get primary fastball for comparison
+  primary <- pitcher_df %>% 
+    filter(TaggedPitchType %in% c("Fastball", "Sinker", "Four-Seam", "FourSeamFastBall"))
   fb_ht <- if (nrow(primary) > 0) mean(primary$RelHeight, na.rm = TRUE) else NA
   fb_side <- if (nrow(primary) > 0) mean(primary$RelSide, na.rm = TRUE) else NA
   
   pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "Other") %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other") %>%
     group_by(TaggedPitchType) %>%
     summarise(
       `Avg. Rel Height (ft.)` = round(mean(RelHeight, na.rm = TRUE), 2),
-      `Rel Ht vs. FB (in.)` = round((mean(RelHeight, na.rm = TRUE) - fb_ht) * 12, 0),
+      `Rel Ht vs. FB (in.)` = ifelse(is.na(fb_ht), NA, round((mean(RelHeight, na.rm = TRUE) - fb_ht) * 12, 0)),
       `Avg. Rel Side (ft.)` = round(mean(RelSide, na.rm = TRUE), 2),
-      `Rel Side vs. FB (in.)` = round((mean(RelSide, na.rm = TRUE) - fb_side) * 12, 0),
+      `Rel Side vs. FB (in.)` = ifelse(is.na(fb_side), NA, round((mean(RelSide, na.rm = TRUE) - fb_side) * 12, 0)),
       `Avg. Extension (ft.)` = round(mean(Extension, na.rm = TRUE), 2),
       .groups = "drop"
     )
 }
 
+# =====================================================================
+# LOCATION PLOT - WITH PROPER ZONE GRAPHICS
+# =====================================================================
 create_tableau_location_plot <- function(pitcher_df, pitch_colors) {
   df <- pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "Other",
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other",
            !is.na(PlateLocSide), !is.na(PlateLocHeight)) %>%
-    mutate(ResultDisplay = case_when(
-      PitchCall %in% c("BallCalled", "BallinDirt") ~ "BallCalled",
-      PlayResult == "Double" ~ "Double",
-      PitchCall %in% c("FoulBall", "FoulBallNotFieldable") ~ "FoulBall",
-      PitchCall == "HitByPitch" ~ "HitByPitch",
-      PlayResult %in% c("Sacrifice", "SacrificeFly") ~ "Sacrifice",
-      PlayResult == "Single" ~ "Single",
-      PitchCall == "StrikeCalled" ~ "StrikeCalled",
-      PitchCall == "StrikeSwinging" ~ "StrikeSwinging",
-      PlayResult == "Triple" ~ "Triple",
-      TRUE ~ "Other"
-    ))
-  
-  if (nrow(df) == 0) return(ggplot() + theme_void() + ggtitle("Location Report"))
-  
-  ggplot(df, aes(x = PlateLocSide, y = PlateLocHeight)) +
-    annotate("rect", xmin = -0.8333, xmax = 0.8333, ymin = 1.5, ymax = 3.37467, fill = NA, color = "black", linewidth = 0.8) +
-    annotate("segment", x = -0.708, y = 0.15, xend = 0.708, yend = 0.15, color = "black") +
-    annotate("segment", x = -0.708, y = 0.30, xend = -0.708, yend = 0.15, color = "black") +
-    annotate("segment", x = 0.708, y = 0.30, xend = 0.708, yend = 0.15, color = "black") +
-    annotate("segment", x = -0.708, y = 0.30, xend = 0, yend = 0.50, color = "black") +
-    annotate("segment", x = 0.708, y = 0.30, xend = 0, yend = 0.50, color = "black") +
+    mutate(
+      ResultDisplay = case_when(
+        PitchCall %in% c("BallCalled", "BallinDirt") ~ "BallCalled",
+        PlayResult == "Double" ~ "Double",
+        PitchCall %in% c("FoulBall", "FoulBallNotFieldable") ~ "FoulBall",
+        PitchCall == "HitByPitch" ~ "HitByPitch",
+        PlayResult %in% c("Sacrifice", "SacrificeFly") ~ "Sacrifice",
+        PlayResult == "Single" ~ "Single",
+        PitchCall == "StrikeCalled" ~ "StrikeCalled",
+        PitchCall == "StrikeSwinging" ~ "StrikeSwinging",
+        PlayResult == "Triple" ~ "Triple",
+        PlayResult == "HomeRun" ~ "HomeRun",
+        PlayResult == "Out" ~ "Out",
+        TRUE ~ "Other"
+      )
+    )
+  
+  if (nrow(df) == 0) {
+    return(ggplot() + theme_void() + 
+             labs(title = "Location Report") +
+             theme(plot.title = element_text(size = 14, face = "bold", hjust = 0.5)))
+  }
+  
+  # Define zone boundaries
+  zone_left <- -0.8333
+  zone_right <- 0.8333
+  zone_bottom <- 1.5
+  zone_top <- 3.5
+  
+  # Shadow zone (outer dashed) - about 0.25 wider on each side
+  shadow_left <- -1.1
+  shadow_right <- 1.1
+  shadow_bottom <- 1.2
+  shadow_top <- 3.8
+  
+  # Inner zone thirds
+  zone_width <- (zone_right - zone_left) / 3
+  zone_height <- (zone_top - zone_bottom) / 3
+  
+  p <- ggplot(df, aes(x = PlateLocSide, y = PlateLocHeight)) +
+    
+    # Shadow zone (outer dashed rectangle)
+    annotate("rect", 
+             xmin = shadow_left, xmax = shadow_right, 
+             ymin = shadow_bottom, ymax = shadow_top, 
+             fill = NA, color = "gray30", linetype = "dashed", linewidth = 0.6) +
+    
+    # Strike zone (solid RED rectangle)
+    annotate("rect", 
+             xmin = zone_left, xmax = zone_right, 
+             ymin = zone_bottom, ymax = zone_top, 
+             fill = NA, color = "#E74C3C", linewidth = 1.2) +
+    
+    # Inner zone divisions (dashed gray lines)
+    # Vertical lines
+    annotate("segment", x = zone_left + zone_width, xend = zone_left + zone_width,
+             y = zone_bottom, yend = zone_top, color = "gray50", linetype = "dashed", linewidth = 0.4) +
+    annotate("segment", x = zone_left + 2*zone_width, xend = zone_left + 2*zone_width,
+             y = zone_bottom, yend = zone_top, color = "gray50", linetype = "dashed", linewidth = 0.4) +
+    # Horizontal lines
+    annotate("segment", x = zone_left, xend = zone_right,
+             y = zone_bottom + zone_height, yend = zone_bottom + zone_height, 
+             color = "gray50", linetype = "dashed", linewidth = 0.4) +
+    annotate("segment", x = zone_left, xend = zone_right,
+             y = zone_bottom + 2*zone_height, yend = zone_bottom + 2*zone_height, 
+             color = "gray50", linetype = "dashed", linewidth = 0.4) +
+    
+    # Home plate
+    annotate("segment", x = -0.708, y = 0.15, xend = 0.708, yend = 0.15, color = "black", linewidth = 0.6) +
+    annotate("segment", x = -0.708, y = 0.30, xend = -0.708, yend = 0.15, color = "black", linewidth = 0.6) +
+    annotate("segment", x = 0.708, y = 0.30, xend = 0.708, yend = 0.15, color = "black", linewidth = 0.6) +
+    annotate("segment", x = -0.708, y = 0.30, xend = 0, yend = 0.50, color = "black", linewidth = 0.6) +
+    annotate("segment", x = 0.708, y = 0.30, xend = 0, yend = 0.50, color = "black", linewidth = 0.6) +
+    
+    # Center line (dashed, vertical through zone)
+    annotate("segment", x = 0, xend = 0, y = 0.5, yend = shadow_top + 0.3, 
+             color = "gray60", linetype = "dotted", linewidth = 0.4) +
+    
+    # Pitch points
     geom_point(aes(color = TaggedPitchType, shape = ResultDisplay), size = 3.5, stroke = 1.2) +
+    
     scale_color_manual(values = pitch_colors, name = "Pitch Type") +
-    scale_shape_manual(values = c("BallCalled" = 1, "Double" = 18, "FoulBall" = 2, "HitByPitch" = 8,
-                                   "Sacrifice" = 3, "Single" = 19, "StrikeCalled" = 4, 
-                                   "StrikeSwinging" = 8, "Triple" = 17, "Other" = 16),
-                       name = "Play Result") +
-    coord_fixed(xlim = c(-2, 2), ylim = c(0, 4.5)) +
+    scale_shape_manual(
+      values = c(
+        "BallCalled" = 1,      # Open circle
+        "Double" = 18,         # Diamond
+        "FoulBall" = 2,        # Open triangle
+        "HitByPitch" = 8,      # Asterisk
+        "Sacrifice" = 3,       # Plus
+        "Single" = 19,         # Half-filled circle
+        "StrikeCalled" = 4,    # X
+        "StrikeSwinging" = 8,  # Asterisk
+        "Triple" = 17,         # Filled triangle
+        "HomeRun" = 18,        # Diamond
+        "Out" = 4,             # X
+        "Other" = 16           # Filled circle
+      ),
+      name = "Play Result"
+    ) +
+    
+    coord_fixed(xlim = c(-2.2, 2.2), ylim = c(-0.2, 4.5)) +
     labs(title = "Location Report") +
     theme_minimal() +
-    theme(plot.title = element_text(size = 14, face = "bold", hjust = 0.5),
-          legend.position = "left", axis.text = element_blank(), 
-          axis.ticks = element_blank(), panel.grid = element_blank())
+    theme(
+      plot.title = element_text(size = 14, face = "bold", hjust = 0.5),
+      legend.position = "left",
+      legend.title = element_text(size = 8, face = "bold"),
+      legend.text = element_text(size = 7),
+      axis.text = element_blank(),
+      axis.title = element_blank(),
+      axis.ticks = element_blank(),
+      panel.grid = element_blank()
+    )
+  
+  p
 }
 
 create_tableau_movement_plot <- function(pitcher_df, pitch_colors) {
   df <- pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "Other",
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other",
            !is.na(HorzBreak), !is.na(InducedVertBreak))
   
-  if (nrow(df) == 0) return(ggplot() + theme_void() + ggtitle("Movement Profile"))
+  if (nrow(df) == 0) {
+    return(ggplot() + theme_void() + 
+             labs(title = "Movement Profile") +
+             theme(plot.title = element_text(size = 14, face = "bold", hjust = 0.5)))
+  }
   
   ggplot(df, aes(x = HorzBreak, y = InducedVertBreak, color = TaggedPitchType)) +
-    geom_vline(xintercept = 0, color = "black") +
-    geom_hline(yintercept = 0, color = "black") +
+    geom_vline(xintercept = 0, color = "black", linewidth = 0.5) +
+    geom_hline(yintercept = 0, color = "black", linewidth = 0.5) +
     geom_point(size = 3, alpha = 0.8) +
     scale_color_manual(values = pitch_colors) +
-    coord_cartesian(xlim = c(-30, 30), ylim = c(-30, 30)) +
+    coord_cartesian(xlim = c(-25, 25), ylim = c(-25, 25)) +
     labs(title = "Movement Profile", x = "Horz Break", y = "Induced Vert Break") +
     theme_minimal() +
-    theme(plot.title = element_text(size = 14, face = "bold", hjust = 0.5), legend.position = "none")
+    theme(
+      plot.title = element_text(size = 14, face = "bold", hjust = 0.5),
+      legend.position = "none",
+      axis.title = element_text(size = 9),
+      axis.text = element_text(size = 8)
+    )
 }
 
 create_tableau_release_plot <- function(pitcher_df, pitch_colors) {
   df <- pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "Other",
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other",
            !is.na(RelSide), !is.na(RelHeight))
   
-  if (nrow(df) == 0) return(ggplot() + theme_void() + ggtitle("Release Plot"))
+  if (nrow(df) == 0) {
+    return(ggplot() + theme_void() + 
+             labs(title = "Release Plot") +
+             theme(plot.title = element_text(size = 14, face = "bold", hjust = 0.5)))
+  }
   
-  ggplot(df, aes(x = RelSide, y = RelHeight, color = TaggedPitchType)) +
-    geom_point(size = 3, alpha = 0.8) +
+  # Create mound arc data (terracotta half-circle)
+  mound_theta <- seq(0, pi, length.out = 100)
+  mound_radius <- 3
+  mound_df <- data.frame(
+    x = mound_radius * cos(mound_theta),
+    y = mound_radius * sin(mound_theta) * 0.35  # Flatten the arc
+  )
+  
+  ggplot(df, aes(x = RelSide, y = RelHeight)) +
+    # Mound (terracotta half-circle)
+    geom_polygon(data = mound_df, aes(x = x, y = y), 
+                 fill = "#C0392B", color = NA, inherit.aes = FALSE) +
+    
+    # Pitching rubber (white rectangle)
+    annotate("rect", xmin = -0.5, xmax = 0.5, ymin = 0.85, ymax = 1.05, 
+             fill = "white", color = "gray40", linewidth = 0.3) +
+    
+    # Center line (dashed vertical)
+    geom_vline(xintercept = 0, color = "gray60", linetype = "dashed", linewidth = 0.4) +
+    
+    # Release points
+    geom_point(aes(color = TaggedPitchType), size = 3, alpha = 0.8) +
+    
     scale_color_manual(values = pitch_colors) +
-    coord_cartesian(xlim = c(-4, 4), ylim = c(0, 6)) +
+    coord_cartesian(xlim = c(-4, 4), ylim = c(0, 7)) +
     labs(title = "Release Plot", x = "Rel Side", y = "Rel Height") +
     theme_minimal() +
-    theme(plot.title = element_text(size = 14, face = "bold", hjust = 0.5), legend.position = "none")
+    theme(
+      plot.title = element_text(size = 14, face = "bold", hjust = 0.5),
+      legend.position = "none",
+      axis.title = element_text(size = 9),
+      axis.text = element_text(size = 8)
+    )
 }
 
+draw_tableau_table <- function(title, data, metrics, pitch_types, pitch_colors, 
+                                x_start, y_start, col_w = 0.12, row_h = 0.018) {
+  
+  # Title
+  grid.text(title, x = x_start + 0.2, y = y_start + 0.03, 
+            gp = gpar(fontface = "bold", cex = 0.9))
+  
+  # Column headers (pitch types)
+  header_y <- y_start
+  for (i in seq_along(pitch_types)) {
+    pt <- pitch_types[i]
+    col_color <- ifelse(pt %in% names(pitch_colors), pitch_colors[pt], "#95A5A6")
+    
+    grid.rect(x = x_start + (i-1)*col_w, y = header_y, 
+              width = col_w * 0.95, height = row_h * 1.1,
+              just = c("left", "center"),
+              gp = gpar(fill = col_color, col = "black", lwd = 0.5))
+    
+    grid.text(pt, x = x_start + (i-1)*col_w + col_w/2, y = header_y,
+              gp = gpar(col = "white", cex = 0.45, fontface = "bold"))
+  }
+  
+  # Data rows
+  for (m in seq_along(metrics)) {
+    metric_name <- metrics[m]
+    y_pos <- header_y - m * row_h
+    
+    # Row label
+    grid.text(metric_name, x = x_start - 0.02, y = y_pos, just = "right",
+              gp = gpar(cex = 0.45, fontface = "bold"))
+    
+    # Values for each pitch type
+    for (i in seq_along(pitch_types)) {
+      pt <- pitch_types[i]
+      idx <- which(data$TaggedPitchType == pt)
+      val <- if (length(idx) > 0 && metric_name %in% names(data)) {
+        as.character(data[[metric_name]][idx])
+      } else {
+        "-"
+      }
+      
+      grid.rect(x = x_start + (i-1)*col_w, y = y_pos,
+                width = col_w * 0.95, height = row_h * 0.9,
+                just = c("left", "center"),
+                gp = gpar(fill = "white", col = "gray80", lwd = 0.3))
+      
+      grid.text(val, x = x_start + (i-1)*col_w + col_w/2, y = y_pos,
+                gp = gpar(cex = 0.42))
+    }
+  }
+}
+                     
 create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
+  # Close any open devices
   if (length(dev.list()) > 0) try(dev.off(), silent = TRUE)
   
-  pitcher_df <- process_tableau_pitcher_data(game_df) %>% filter(Pitcher == pitcher_name)
+  # Process and filter data
+  pitcher_df <- process_tableau_pitcher_data(game_df) %>% 
+    filter(Pitcher == pitcher_name)
   
   if (nrow(pitcher_df) == 0) {
-    pdf(output_file, width = 11, height = 8.5)
-    grid::grid.newpage()
-    grid::grid.text(paste("No data for", pitcher_name), gp = grid::gpar(fontsize = 16, fontface = "bold"))
+    pdf(output_file, width = 8.5, height = 11)
+    grid.newpage()
+    grid.text(paste("No data found for", pitcher_name), 
+              gp = gpar(fontsize = 16, fontface = "bold"))
     dev.off()
     return(output_file)
   }
   
+  # Get metadata
   game_date <- tryCatch({
     d <- unique(pitcher_df$Date)[1]
     if (inherits(d, "Date")) format(d, "%m/%d/%Y") else as.character(d)
-  }, error = function(e) "Unknown")
+  }, error = function(e) "NA")
   
   pitcher_team <- unique(pitcher_df$PitcherTeam)[1]
-  if (is.na(pitcher_team)) pitcher_team <- "Multiple values"
-  batter_team_str <- if (length(unique(pitcher_df$BatterTeam)) > 1) "All" else unique(pitcher_df$BatterTeam)[1]
+  if (is.na(pitcher_team)) pitcher_team <- "Unknown"
   
+  batter_teams <- unique(pitcher_df$BatterTeam)
+  batter_team_str <- if (length(batter_teams) > 1) "All" else batter_teams[1]
+  if (is.na(batter_team_str)) batter_team_str <- "Unknown"
+  
+  # Calculate all stats
   stats <- calculate_tableau_header_stats(pitcher_df)
   loc_data <- calculate_tableau_location_data(pitcher_df)
   usage_data <- calculate_tableau_pitch_usage(pitcher_df)
   velo_data <- calculate_tableau_velo_movement(pitcher_df)
   rel_data <- calculate_tableau_release_data(pitcher_df)
   
+  # Get pitch types used
+  pitch_types <- unique(c(loc_data$TaggedPitchType, usage_data$TaggedPitchType))
+  pitch_types <- pitch_types[!is.na(pitch_types) & pitch_types != ""]
+  
+  # Create plots
   loc_plot <- create_tableau_location_plot(pitcher_df, tableau_pitch_colors)
   mov_plot <- create_tableau_movement_plot(pitcher_df, tableau_pitch_colors)
   rel_plot <- create_tableau_release_plot(pitcher_df, tableau_pitch_colors)
   
-  pitch_types <- loc_data$TaggedPitchType
-  
-  pdf(output_file, width = 11, height = 8.5)
+  # Create PDF - PORTRAIT (8.5 x 11)
+  pdf(output_file, width = 8.5, height = 11)
   on.exit(try(dev.off(), silent = TRUE), add = TRUE)
-  grid::grid.newpage()
   
-  # Header
-  grid::grid.rect(x = 0, y = 0.92, width = 1, height = 0.08, just = c("left", "bottom"),
-                  gp = grid::gpar(fill = "#006F71", col = NA))
-  grid::grid.text("Pitcher Post-Game Report", x = 0.02, y = 0.96, just = "left",
-                  gp = grid::gpar(col = "white", fontface = "bold", cex = 1.5))
+  grid.newpage()
+  
+  # =====================================================================
+  # HEADER BAR (Teal)
+  # =====================================================================
+  grid.rect(x = 0, y = 0.94, width = 1, height = 0.06, 
+            just = c("left", "bottom"),
+            gp = gpar(fill = "#006F71", col = NA))
+  
+  grid.text("Pitcher Post-Game Report", x = 0.02, y = 0.97, just = "left",
+            gp = gpar(col = "white", fontface = "bold", cex = 1.4))
   
-  # Info row
+  # =====================================================================
+  # INFO ROW
+  # =====================================================================
+  info_y <- 0.91
   info_labels <- c("Date", "Pitcher Team", "Pitcher", "Batter Team", "vs. L/R")
   info_values <- c(game_date, pitcher_team, pitcher_name, batter_team_str, "All")
+  
   for (i in 1:5) {
-    grid::grid.text(info_labels[i], x = 0.02 + (i-1)*0.18, y = 0.90, just = "left", gp = grid::gpar(cex = 0.7, col = "gray50"))
-    grid::grid.text(info_values[i], x = 0.02 + (i-1)*0.18, y = 0.87, just = "left", gp = grid::gpar(cex = 0.8, fontface = "bold"))
+    x_pos <- 0.02 + (i-1) * 0.18
+    grid.text(info_labels[i], x = x_pos, y = info_y + 0.015, just = "left",
+              gp = gpar(cex = 0.6, col = "gray50"))
+    grid.text(info_values[i], x = x_pos, y = info_y - 0.012, just = "left",
+              gp = gpar(cex = 0.7, fontface = "bold"))
   }
   
-  # Stat boxes
-  stat_labels <- c("At Bats", "H", "XBH", "R", "BB/HBP", "SO", "AVG")
-  stat_values <- c(stats$at_bats, stats$hits, stats$xbh, stats$runs, stats$bb_hbp, stats$so, stats$avg)
-  stat_colors <- c("#006F71", "#006F71", "#006F71", "#E74C3C", "#006F71", "#006F71", "#006F71")
+  # =====================================================================
+  # STAT BOXES (Two rows)
+  # =====================================================================
+  # Row 1: At Bats, H, XBH, R, BB/HBP, SO, AVG
+  stat_labels_1 <- c("At Bats", "H", "XBH", "R", "BB/HBP", "SO", "AVG")
+  stat_values_1 <- c(stats$at_bats, stats$hits, stats$xbh, stats$runs, stats$bb_hbp, stats$so, stats$avg)
+  stat_colors_1 <- c("#006F71", "#006F71", "#006F71", "#E74C3C", "#006F71", "#006F71", "#006F71")
+  
+  box_y1 <- 0.865
+  box_w <- 0.085
+  box_h <- 0.04
   
   for (i in 1:7) {
-    x <- 0.02 + (i-1)*0.07
-    grid::grid.rect(x = x, y = 0.82, width = 0.065, height = 0.055, just = c("left", "center"),
-                    gp = grid::gpar(fill = stat_colors[i], col = "black"))
-    grid::grid.text(stat_labels[i], x = x + 0.0325, y = 0.835, gp = grid::gpar(col = "white", cex = 0.55, fontface = "bold"))
-    grid::grid.text(stat_values[i], x = x + 0.0325, y = 0.805, gp = grid::gpar(col = "white", cex = 0.8, fontface = "bold"))
+    x_pos <- 0.02 + (i-1) * (box_w + 0.01)
+    grid.rect(x = x_pos, y = box_y1, width = box_w, height = box_h,
+              just = c("left", "center"),
+              gp = gpar(fill = stat_colors_1[i], col = "black", lwd = 0.5))
+    grid.text(stat_labels_1[i], x = x_pos + box_w/2, y = box_y1 + 0.01,
+              gp = gpar(col = "white", cex = 0.5, fontface = "bold"))
+    grid.text(as.character(stat_values_1[i]), x = x_pos + box_w/2, y = box_y1 - 0.008,
+              gp = gpar(col = "white", cex = 0.7, fontface = "bold"))
   }
   
-  # Percentage boxes
-  pct_labels <- c("Strike%", "1st P K%", "E+A%", "Comp%", "LOO%")
-  pct_values <- c(stats$strike_pct, stats$fp_k_pct, stats$ea_pct, stats$comp_pct, stats$loo_pct)
+  # Row 2: Strike%, 1st P K%, E+A%, Comp%, LOO%
+  stat_labels_2 <- c("Strike%", "1st P K%", "E+A%", "Comp%", "LOO%")
+  stat_values_2 <- c(stats$strike_pct, stats$fp_k_pct, stats$ea_pct, stats$comp_pct, stats$loo_pct)
+  
+  box_y2 <- 0.82
+  
   for (i in 1:5) {
-    x <- 0.55 + (i-1)*0.075
-    grid::grid.rect(x = x, y = 0.82, width = 0.07, height = 0.055, just = c("left", "center"),
-                    gp = grid::gpar(fill = "#006F71", col = "black"))
-    grid::grid.text(pct_labels[i], x = x + 0.035, y = 0.835, gp = grid::gpar(col = "white", cex = 0.5, fontface = "bold"))
-    grid::grid.text(pct_values[i], x = x + 0.035, y = 0.805, gp = grid::gpar(col = "white", cex = 0.75, fontface = "bold"))
+    x_pos <- 0.02 + (i-1) * (box_w + 0.01)
+    grid.rect(x = x_pos, y = box_y2, width = box_w, height = box_h,
+              just = c("left", "center"),
+              gp = gpar(fill = "#006F71", col = "black", lwd = 0.5))
+    grid.text(stat_labels_2[i], x = x_pos + box_w/2, y = box_y2 + 0.01,
+              gp = gpar(col = "white", cex = 0.5, fontface = "bold"))
+    grid.text(stat_values_2[i], x = x_pos + box_w/2, y = box_y2 - 0.008,
+              gp = gpar(col = "white", cex = 0.7, fontface = "bold"))
   }
   
   # PDF button
-  grid::grid.rect(x = 0.94, y = 0.82, width = 0.05, height = 0.055, just = c("left", "center"),
-                  gp = grid::gpar(fill = "#E74C3C", col = "black"))
-  grid::grid.text("PDF", x = 0.965, y = 0.82, gp = grid::gpar(col = "white", cex = 0.7, fontface = "bold"))
-  
-  # Location Plot
-  grid::pushViewport(grid::viewport(x = 0.22, y = 0.52, width = 0.40, height = 0.28))
+  grid.rect(x = 0.92, y = 0.84, width = 0.06, height = 0.06,
+            just = c("left", "center"),
+            gp = gpar(fill = "#E74C3C", col = "black", lwd = 0.5))
+  grid.text("PDF", x = 0.95, y = 0.84,
+            gp = gpar(col = "white", cex = 0.7, fontface = "bold"))
+  
+  # =====================================================================
+  # LOCATION PLOT (Left side, smaller)
+  # =====================================================================
+  pushViewport(viewport(x = 0.25, y = 0.60, width = 0.45, height = 0.32))
   print(loc_plot, newpage = FALSE)
-  grid::popViewport()
+  popViewport()
   
-  # Location Data Table
-  grid::grid.text("Location Data", x = 0.75, y = 0.74, gp = grid::gpar(fontface = "bold", cex = 1.0))
-  col_w <- 0.07; row_h <- 0.025
-  for (i in seq_along(pitch_types)) {
-    grid::grid.rect(x = 0.58 + i*col_w, y = 0.70, width = col_w*0.95, height = row_h,
-                    just = c("left", "center"), gp = grid::gpar(fill = tableau_pitch_colors[pitch_types[i]], col = "black"))
-    grid::grid.text(pitch_types[i], x = 0.58 + i*col_w + col_w/2, y = 0.70,
-                    gp = grid::gpar(col = "white", cex = 0.5, fontface = "bold"))
-  }
-  metrics <- c("Zone%", "Edge%", "Strike%", "Whiff%")
-  for (m in seq_along(metrics)) {
-    y <- 0.70 - m*row_h
-    grid::grid.text(metrics[m], x = 0.58, y = y, just = "left", gp = grid::gpar(cex = 0.55, fontface = "bold"))
-    for (i in seq_along(pitch_types)) {
-      val <- loc_data[[metrics[m]]][i]
-      grid::grid.rect(x = 0.58 + i*col_w, y = y, width = col_w*0.95, height = row_h*0.9,
-                      just = c("left", "center"), gp = grid::gpar(fill = "white", col = "gray80"))
-      grid::grid.text(paste0(val, "%"), x = 0.58 + i*col_w + col_w/2, y = y, gp = grid::gpar(cex = 0.5))
-    }
-  }
+  # =====================================================================
+  # LOCATION DATA TABLE (Right side)
+  # =====================================================================
+  draw_tableau_table(
+    title = "Location Data",
+    data = loc_data,
+    metrics = c("Zone%", "Edge%", "Strike%", "Whiff%"),
+    pitch_types = pitch_types,
+    pitch_colors = tableau_pitch_colors,
+    x_start = 0.55, y_start = 0.73,
+    col_w = min(0.12, 0.4 / max(1, length(pitch_types))),
+    row_h = 0.018
+  )
   
-  # Pitch Usage Table
-  grid::grid.text("Pitch Usage", x = 0.75, y = 0.55, gp = grid::gpar(fontface = "bold", cex = 1.0))
-  for (i in seq_along(pitch_types)) {
-    grid::grid.rect(x = 0.58 + i*col_w, y = 0.52, width = col_w*0.95, height = row_h,
-                    just = c("left", "center"), gp = grid::gpar(fill = tableau_pitch_colors[pitch_types[i]], col = "black"))
-    grid::grid.text(pitch_types[i], x = 0.58 + i*col_w + col_w/2, y = 0.52, gp = grid::gpar(col = "white", cex = 0.5, fontface = "bold"))
-  }
-  usage_metrics <- c("Usage vs. LHH", "Usage vs. RHH", "Pitch Count")
-  for (m in seq_along(usage_metrics)) {
-    y <- 0.52 - m*row_h
-    grid::grid.text(usage_metrics[m], x = 0.58, y = y, just = "left", gp = grid::gpar(cex = 0.55, fontface = "bold"))
-    for (i in seq_along(pitch_types)) {
-      idx <- which(usage_data$TaggedPitchType == pitch_types[i])
-      val <- if (length(idx) > 0) usage_data[[usage_metrics[m]]][idx] else "-"
-      grid::grid.rect(x = 0.58 + i*col_w, y = y, width = col_w*0.95, height = row_h*0.9,
-                      just = c("left", "center"), gp = grid::gpar(fill = "white", col = "gray80"))
-      grid::grid.text(as.character(val), x = 0.58 + i*col_w + col_w/2, y = y, gp = grid::gpar(cex = 0.5))
-    }
-  }
+  # =====================================================================
+  # PITCH USAGE TABLE (Right side, below location data)
+  # =====================================================================
+  draw_tableau_table(
+    title = "Pitch Usage",
+    data = usage_data,
+    metrics = c("Usage vs. LHH", "Usage vs. RHH", "Pitch Count"),
+    pitch_types = pitch_types,
+    pitch_colors = tableau_pitch_colors,
+    x_start = 0.55, y_start = 0.58,
+    col_w = min(0.12, 0.4 / max(1, length(pitch_types))),
+    row_h = 0.018
+  )
   
-  # Divider
-  grid::grid.lines(x = c(0, 1), y = c(0.38, 0.38), gp = grid::gpar(col = "gray80", lty = "dotted"))
+  # =====================================================================
+  # DIVIDER
+  # =====================================================================
+  grid.lines(x = c(0.02, 0.98), y = c(0.42, 0.42), 
+             gp = gpar(col = "gray70", lty = "dotted"))
   
-  # Movement Plot
-  grid::pushViewport(grid::viewport(x = 0.22, y = 0.22, width = 0.38, height = 0.16))
+  # =====================================================================
+  # MOVEMENT PLOT (Left side)
+  # =====================================================================
+  pushViewport(viewport(x = 0.25, y = 0.28, width = 0.45, height = 0.26))
   print(mov_plot, newpage = FALSE)
-  grid::popViewport()
+  popViewport()
   
-  # Velo & Movement Table
-  grid::grid.text("Velo & Movement", x = 0.75, y = 0.36, gp = grid::gpar(fontface = "bold", cex = 1.0))
-  for (i in seq_along(pitch_types)) {
-    grid::grid.rect(x = 0.58 + i*col_w, y = 0.33, width = col_w*0.95, height = row_h,
-                    just = c("left", "center"), gp = grid::gpar(fill = tableau_pitch_colors[pitch_types[i]], col = "black"))
-    grid::grid.text(pitch_types[i], x = 0.58 + i*col_w + col_w/2, y = 0.33, gp = grid::gpar(col = "white", cex = 0.5, fontface = "bold"))
-  }
-  velo_metrics <- c("Avg. Velo", "Max. Velo", "Avg. Spin Rate", "Max. Spin Rate", "Avg. Vert Break", "Avg. Horz Break")
-  for (m in seq_along(velo_metrics)) {
-    y <- 0.33 - m*row_h
-    grid::grid.text(velo_metrics[m], x = 0.58, y = y, just = "left", gp = grid::gpar(cex = 0.5, fontface = "bold"))
-    for (i in seq_along(pitch_types)) {
-      idx <- which(velo_data$TaggedPitchType == pitch_types[i])
-      val <- if (length(idx) > 0) velo_data[[velo_metrics[m]]][idx] else "-"
-      grid::grid.rect(x = 0.58 + i*col_w, y = y, width = col_w*0.95, height = row_h*0.9,
-                      just = c("left", "center"), gp = grid::gpar(fill = "white", col = "gray80"))
-      grid::grid.text(as.character(val), x = 0.58 + i*col_w + col_w/2, y = y, gp = grid::gpar(cex = 0.45))
-    }
-  }
+  # =====================================================================
+  # VELO & MOVEMENT TABLE (Right side)
+  # =====================================================================
+  draw_tableau_table(
+    title = "Velo & Movement",
+    data = velo_data,
+    metrics = c("Avg. Velo", "Max. Velo", "Avg. Spin Rate", "Max. Spin Rate", 
+                "Avg. Vert Break", "Avg. Horz Break"),
+    pitch_types = pitch_types,
+    pitch_colors = tableau_pitch_colors,
+    x_start = 0.55, y_start = 0.38,
+    col_w = min(0.12, 0.4 / max(1, length(pitch_types))),
+    row_h = 0.016
+  )
   
-  # Divider
-  grid::grid.lines(x = c(0, 1), y = c(0.14, 0.14), gp = grid::gpar(col = "gray80", lty = "dotted"))
+  # =====================================================================
+  # DIVIDER
+  # =====================================================================
+  grid.lines(x = c(0.02, 0.98), y = c(0.14, 0.14), 
+             gp = gpar(col = "gray70", lty = "dotted"))
   
-  # Release Plot
-  grid::pushViewport(grid::viewport(x = 0.22, y = 0.07, width = 0.38, height = 0.12))
+  # =====================================================================
+  # RELEASE PLOT (Left side)
+  # =====================================================================
+  pushViewport(viewport(x = 0.25, y = 0.07, width = 0.45, height = 0.13))
   print(rel_plot, newpage = FALSE)
-  grid::popViewport()
+  popViewport()
   
-  # Release Data Table
-  grid::grid.text("Release Data", x = 0.75, y = 0.13, gp = grid::gpar(fontface = "bold", cex = 1.0))
-  row_h_rel <- 0.018
-  for (i in seq_along(pitch_types)) {
-    grid::grid.rect(x = 0.58 + i*col_w, y = 0.10, width = col_w*0.95, height = row_h_rel,
-                    just = c("left", "center"), gp = grid::gpar(fill = tableau_pitch_colors[pitch_types[i]], col = "black"))
-    grid::grid.text(pitch_types[i], x = 0.58 + i*col_w + col_w/2, y = 0.10, gp = grid::gpar(col = "white", cex = 0.45, fontface = "bold"))
-  }
-  rel_metrics <- c("Avg. Rel Height (ft.)", "Rel Ht vs. FB (in.)", "Avg. Rel Side (ft.)", "Rel Side vs. FB (in.)", "Avg. Extension (ft.)")
-  for (m in seq_along(rel_metrics)) {
-    y <- 0.10 - m*row_h_rel
-    grid::grid.text(rel_metrics[m], x = 0.58, y = y, just = "left", gp = grid::gpar(cex = 0.45, fontface = "bold"))
-    for (i in seq_along(pitch_types)) {
-      idx <- which(rel_data$TaggedPitchType == pitch_types[i])
-      val <- if (length(idx) > 0) rel_data[[rel_metrics[m]]][idx] else "-"
-      grid::grid.rect(x = 0.58 + i*col_w, y = y, width = col_w*0.95, height = row_h_rel*0.9,
-                      just = c("left", "center"), gp = grid::gpar(fill = "white", col = "gray80"))
-      grid::grid.text(as.character(val), x = 0.58 + i*col_w + col_w/2, y = y, gp = grid::gpar(cex = 0.42))
-    }
-  }
+  # =====================================================================
+  # RELEASE DATA TABLE (Right side)
+  # =====================================================================
+  draw_tableau_table(
+    title = "Release Data",
+    data = rel_data,
+    metrics = c("Avg. Rel Height (ft.)", "Rel Ht vs. FB (in.)", 
+                "Avg. Rel Side (ft.)", "Rel Side vs. FB (in.)", 
+                "Avg. Extension (ft.)"),
+    pitch_types = pitch_types,
+    pitch_colors = tableau_pitch_colors,
+    x_start = 0.55, y_start = 0.12,
+    col_w = min(0.12, 0.4 / max(1, length(pitch_types))),
+    row_h = 0.014
+  )
   
   invisible(output_file)
 }
@@ -3933,7 +4226,7 @@ radioButtons("report_type", "Report Type",
              c("Hitter"="hitter",
                "Pitcher"="pitcher",
                "Advanced Pitcher"="advanced_pitcher",
-               "Tableau Pitcher"="tableau_pitcher",
+               "Matt Williams Report"="tableau_pitcher",
                "Catcher"="catcher",
                "Umpire"="umpire",
                "BP Report"="bp"),