Update app.R

app.R

@@ -20,23 +20,112 @@ library(png)
 library(xgboost)
 library(httr)
 library(jpeg)
-library(zoo)  # For rolling mean calculation
+library(zoo)  
 
 pdf(file = NULL)
 Sys.setenv(TZ='EST')
 
 model <- xgb.load('TimStuff2.model')
+
 # Helper functions
+gtable_add_padding <- function(gtable, padding = unit(c(5, 5, 5, 5), "mm")) {
+  padding <- rep(padding, length.out = 4)
+  
+  # Add padding to the layout
+  new_widths <- unit.c(padding[4], gtable$widths, padding[2])
+  new_heights <- unit.c(padding[1], gtable$heights, padding[3])
+  
+  # Create the new layout with added padding
+  new_layout <- gtable$layout
+  new_layout$l <- new_layout$l + 1
+  new_layout$t <- new_layout$t + 1
+  
+  # Create new gtable with padding
+  new_gtable <- gtable(
+    widths = new_widths,
+    heights = new_heights
+  )
+  
+  # Add grobs from original gtable
+  new_gtable$layout <- new_layout
+  new_gtable$grobs <- gtable$grobs
+  
+  return(new_gtable)
+}
+get_team_logo <- function(team_name) {
+  # ESPN team ID and URL mapping
+  team_info <- list(
+    "Los Angeles Angels" = "LAA",
+    "Arizona Diamondbacks" = "ARI",
+    "Baltimore Orioles" = "BAL",
+    "Boston Red Sox" = "BOS",
+    "Chicago Cubs" = "CHC",
+    "Cincinnati Reds" = "CIN",
+    "Cleveland Guardians" = "CLE",
+    "Colorado Rockies" = "COL",
+    "Detroit Tigers" = "DET",
+    "Houston Astros" = "HOU",
+    "Kansas City Royals" = "KC",
+    "Los Angeles Dodgers" = "LAD",
+    "Washington Nationals" = "WSH",
+    "New York Mets" = "NYM",
+    "Oakland Athletics" = "OAK",
+    "Pittsburgh Pirates" = "PIT",
+    "San Diego Padres" = "SD",
+    "Seattle Mariners" = "SEA",
+    "San Francisco Giants" = "SF",
+    "St. Louis Cardinals" = "STL",
+    "Tampa Bay Rays" = "TB",
+    "Texas Rangers" = "TEX",
+    "Toronto Blue Jays" = "TOR",
+    "Minnesota Twins" = "MIN",
+    "Philadelphia Phillies" = "PHI",
+    "Atlanta Braves" = "ATL",
+    "Chicago White Sox" = "CHW",
+    "Miami Marlins" = "MIA",
+    "New York Yankees" = "NYY",
+    "Milwaukee Brewers" = "MIL"
+  )
+  
+  team_abbrev <- team_info[[team_name]]
+  if (is.null(team_abbrev)) {
+    return(textGrob("Logo not available", gp = gpar(col = "gray", fontsize = 12)))
+  }
+  
+  logo_url <- sprintf("https://a.espncdn.com/combiner/i?img=/i/teamlogos/mlb/500/scoreboard/%s.png&h=400&w=400", team_abbrev)
+  logo_result <- download_and_process_image(logo_url)
+  
+  if (!is.null(logo_result)) {
+    # Set fixed size for the logo
+    return(rasterGrob(logo_result$img, 
+                      interpolate = TRUE,
+                      width = unit(.75, "npc"),  # Reduced size to 50% of container
+                      height = unit(.75, "npc")))
+  } else {
+    return(textGrob("Logo not available", gp = gpar(col = "gray", fontsize = 12)))
+  }
+}
+
 download_and_process_image <- function(url) {
   tryCatch({
     response <- GET(url)
     content_type <- http_type(response)
     
-    if (content_type %in% c("image/png", "image/jpeg")) {
-      temp_file <- tempfile(fileext = ifelse(content_type == "image/png", ".png", ".jpg"))
+    if (content_type %in% c("image/png", "image/jpeg", "image/svg+xml")) {
+      temp_file <- tempfile(fileext = switch(content_type,
+                                           "image/png" = ".png",
+                                           "image/jpeg" = ".jpg",
+                                           "image/svg+xml" = ".svg"))
       writeBin(content(response, "raw"), temp_file)
       
-      if (content_type == "image/png") {
+      # For SVG, convert to PNG first
+      if (content_type == "image/svg+xml") {
+        svg_content <- readLines(temp_file, warn = FALSE)
+        # Create a PNG from the SVG
+        png_file <- tempfile(fileext = ".png")
+        rsvg::rsvg_png(temp_file, png_file)
+        img <- png::readPNG(png_file)
+      } else if (content_type == "image/png") {
         img <- readPNG(temp_file)
       } else {
         img <- readJPEG(temp_file)
@@ -116,7 +205,7 @@ break_plot <- function(game){
     "Fastball"= "#7FDBFF",            
     "Slow Curve"= "#DDDDDD",          
     "Screwball"= "#FF69B4"            
-)
+  )
   ggplot(game, aes(x = HB, y = IVB, color = pitch_name)) +
     geom_point(size = 2) +
     geom_vline(xintercept = 0, color = "lightblue", linewidth = 1, linetype = 4) +
@@ -131,111 +220,11 @@ break_plot <- function(game){
       legend.position = "bottom",
       plot.title = element_text(hjust = 0.5, face = "bold"),
       panel.grid.minor = element_line(color = "gray", size = 0.25, linetype = 1),
-      aspect.ratio = 1,  # This ensures the plot is square
-    ) +
-    guides(color = guide_legend(title = "Pitch Type", nrow = 1))
-}
-
-pitch_plot <- function(game, title, bhand = NULL) {
-  # if (!is.null(bhand)) {
-  #   game <- game %>% filter(bhand == bhand)
-  # }
-  # 
-  pitch_colors <- c(
-    "Four-Seam Fastball"= "#FF4136", 
-    "Sinker"= "#FF851B",              
-    "Cutter"= "#FFDC00",              
-    "Changeup"= "#2ECC40",            
-    "Slider"= "#0074D9",              
-    "Sweeper"= "#ED68ED",             
-    "Curveball"= "#B10DC9",           
-    "Splitter"= "#01FF70",           
-    "Knuckle Curve"= "#85144b",       
-    "Slurve"= "#3D9970",              
-    "Knuckle Ball"= "#39CCCC",        
-    "Forkball"= "#F012BE",           
-    "Eephus"= "#AAAAAA",              
-    "Fastball"= "#7FDBFF",            
-    "Slow Curve"= "#DDDDDD",          
-    "Screwball"= "#FF69B4"            
-)
-  ggplot(game, aes(x = px, y = pz, color = pitch_name)) +
-    geom_point(size = 3.5) +
-    geom_segment(aes(x = -0.71, xend = 0.71, y = 1.5, yend = 1.5)) +
-    geom_segment(aes(x = -0.71, xend = 0.71, y = 3.6, yend = 3.6)) +
-    geom_segment(aes(x = 0.71, xend = 0.71, y = 1.5, yend = 3.6)) +
-    geom_segment(aes(x = -0.71, xend = -0.71, y = 1.5, yend = 3.6)) +
-    scale_color_manual(values = pitch_colors) +
-    labs(x = NULL, y = NULL, title = title) +
-    xlim(-3, 3) +
-    ylim(0.2, 4) +
-    coord_fixed(ratio = 1) +
-    theme_minimal() +
-    theme(
-      legend.position = "bottom",
-      plot.title = element_text(hjust = 0.5, face = "bold"),
-      axis.text = element_blank(),
-      axis.ticks = element_blank()
+      aspect.ratio = 1
     ) +
     guides(color = guide_legend(title = "Pitch Type", nrow = 1))
 }
 
-calculate_VAA <- function(vz0, ay, az, vy0, y0) {
-  -atan((vz0+(az*(-sqrt((vy0*vy0)-(2*ay*(y0-(17/12))))-vy0)/
-                ay))/(-sqrt((vy0*vy0)-(2*ay*(y0-(17/12))))))*(180/pi)
-}
-
-calculate_EAA <- function(extension) {
-  extension / 6.3
-}
-
-calculate_SADiff <- function(pfxX, pfxZ, spinDirection) {
-  inSA <- atan2(pfxZ, pfxX) * 180/pi + 90
-  inSA <- ifelse(inSA < 0, inSA + 360, inSA)
-  SADiff <- spinDirection - inSA
-  SADiff <- ifelse(SADiff > 180, SADiff - 360, SADiff)
-  SADiff <- ifelse(SADiff < -180, SADiff + 360, SADiff)
-  return(SADiff)
-}
-
-scale_TimStuff <- function(raw_score, model_mean, model_sd) {
-  scaled_score <- (raw_score - model_mean) / model_sd
-  result <- 100 - (scaled_score * 10)
-  return(result)
-}
-
-# Modify the getBoxScore function
-
-getBoxScore <- function(game_pk, pid) {
-  url <- paste0("https://statsapi.mlb.com/api/v1/game/", game_pk, "/boxscore")
-  bs <- fromJSON(url)
-  
-  t <- as.data.frame(bs[["teams"]][["away"]][["players"]][[paste0("ID", pid)]][["stats"]][["pitching"]])
-  if (nrow(t) == 0) {
-    t <- as.data.frame(bs[["teams"]][["home"]][["players"]][[paste0("ID", pid)]][["stats"]][["pitching"]])
-  }
-  
-  # Define the stats we want and their display names
-  stats <- c("inningsPitched", "battersFaced", "runs", "earnedRuns", "hits", "baseOnBalls", "strikeOuts", "strikePercentage")
-  display_names <- c("IP", "TBF", "R", "ER", "H", "BB", "K", "Strike%")
-  
-  # Create a new data frame with only the stats we want
-  result <- data.frame(matrix(ncol = length(stats), nrow = 1))
-  colnames(result) <- display_names
-  
-  for (i in 1:length(stats)) {
-    value <- t[[stats[i]]]
-    if (is.null(value)) value <- "0"
-    if (stats[i] == "strikePercentage") {
-      value <- paste0(round(as.numeric(value) * 100, 1), "%")
-    }
-    result[1, i] <- as.character(value)
-  }
-  
-  return(result)
-}
-
-# Create a new function for split pitch location plots
 left_batter <- png::readPNG("left_batter.png")
 right_batter <- png::readPNG("right_batter.png")
 
@@ -243,10 +232,9 @@ pitch_plot_split <- function(game, title) {
   game_lhb <- game %>% filter(bhand == "L")
   game_rhb <- game %>% filter(bhand == "R")
   
-  # Define home plate coordinates (adjusted position)
   home_plate <- data.frame(
-    x = c(0.6, -0.6, -0.7083, 0, 0.7083),  # Keep x-coordinates
-    y = c(0.5, 0.5, 0.25, 0, 0.25)  # Adjust y-coordinates to put point at 0
+    x = c(0.6, -0.6, -0.7083, 0, 0.7083),
+    y = c(0.5, 0.5, 0.25, 0, 0.25)
   )
   
   pitch_colors <- c(
@@ -266,14 +254,11 @@ pitch_plot_split <- function(game, title) {
     "Fastball"= "#7FDBFF",            
     "Slow Curve"= "#DDDDDD",          
     "Screwball"= "#FF69B4"            
-  )  
+  )
   
-  # Create left-handed batter plot
   plot_lhb <- ggplot(game_lhb, aes(x = px, y = pz, color = pitch_name)) +
-    # Add home plate first (so it appears under the points)
     geom_polygon(data = home_plate, aes(x = x, y = y), 
                  fill = "white", color = "black", inherit.aes = FALSE) +
-    # Add batter image (now using left_batter on right side)
     annotation_custom(rasterGrob(left_batter, 
                                  width = unit(.75, "npc"),
                                  height = unit(1.5, "npc")),
@@ -297,12 +282,9 @@ pitch_plot_split <- function(game, title) {
       axis.ticks = element_blank()
     )
   
-  # Create right-handed batter plot
   plot_rhb <- ggplot(game_rhb, aes(x = px, y = pz, color = pitch_name)) +
-    # Add home plate first
     geom_polygon(data = home_plate, aes(x = x, y = y), 
                  fill = "white", color = "black", inherit.aes = FALSE) +
-    # Add batter image (now using right_batter on left side)
     annotation_custom(rasterGrob(right_batter, 
                                  width = unit(.75, "npc"),
                                  height = unit(1.5, "npc")),
@@ -329,6 +311,56 @@ pitch_plot_split <- function(game, title) {
   return(list(lhb = plot_lhb, rhb = plot_rhb))
 }
 
+calculate_VAA <- function(vz0, ay, az, vy0, y0) {
+  -atan((vz0+(az*(-sqrt((vy0*vy0)-(2*ay*(y0-(17/12))))-vy0)/
+                ay))/(-sqrt((vy0*vy0)-(2*ay*(y0-(17/12))))))*(180/pi)
+}
+
+calculate_EAA <- function(extension) {
+  extension / 6.3
+}
+
+calculate_SADiff <- function(pfxX, pfxZ, spinDirection) {
+  inSA <- atan2(pfxZ, pfxX) * 180/pi + 90
+  inSA <- ifelse(inSA < 0, inSA + 360, inSA)
+  SADiff <- spinDirection - inSA
+  SADiff <- ifelse(SADiff > 180, SADiff - 360, SADiff)
+  SADiff <- ifelse(SADiff < -180, SADiff + 360, SADiff)
+  return(SADiff)
+}
+
+scale_TimStuff <- function(raw_score, model_mean, model_sd) {
+  scaled_score <- (raw_score - model_mean) / model_sd
+  result <- 100 - (scaled_score * 10)
+  return(result)
+}
+
+getBoxScore <- function(game_pk, pid) {
+  url <- paste0("https://statsapi.mlb.com/api/v1/game/", game_pk, "/boxscore")
+  bs <- fromJSON(url)
+  
+  t <- as.data.frame(bs[["teams"]][["away"]][["players"]][[paste0("ID", pid)]][["stats"]][["pitching"]])
+  if (nrow(t) == 0) {
+    t <- as.data.frame(bs[["teams"]][["home"]][["players"]][[paste0("ID", pid)]][["stats"]][["pitching"]])
+  }
+  
+  stats <- c("inningsPitched", "battersFaced", "runs", "earnedRuns", "hits", "baseOnBalls", "strikeOuts", "strikePercentage")
+  display_names <- c("IP", "TBF", "R", "ER", "H", "BB", "K", "Strike%")
+  
+  result <- data.frame(matrix(ncol = length(stats), nrow = 1))
+  colnames(result) <- display_names
+  
+  for (i in 1:length(stats)) {
+    value <- t[[stats[i]]]
+    if (is.null(value)) value <- "0"
+    if (stats[i] == "strikePercentage") {
+      value <- paste0(round(as.numeric(value) * 100, 1), "%")
+    }
+    result[1, i] <- as.character(value)
+  }
+  
+  return(result)
+}
 
 calculate_timstuff <- function(game) {
   game <- game %>%
@@ -417,76 +449,78 @@ summary_table <- function(game) {
   
   return(result)
 }
-# Initialize schedule data
-mlbid <- mlb_schedule(season = 2025, level_ids = "1")
+
+
+mlbid <- bind_rows(
+  mlb_schedule(season = 2020, level_ids = "1"),
+  mlb_schedule(season = 2021, level_ids = "1"),
+  mlb_schedule(season = 2022, level_ids = "1"),
+  mlb_schedule(season = 2023, level_ids = "1"),
+  mlb_schedule(season = 2024, level_ids = "1"),
+  mlb_schedule(season = 2025, level_ids = "1")
+)
 mlbteamH <- mlbid %>%
-  select(teams_home_team_name)
-mlbteamH <- distinct(mlbteamH)
+  select(teams_home_team_name) %>%
+  distinct()
 mlbteamA <- mlbid %>%
-  select(teams_away_team_name)
-mlbteamA <- distinct(mlbteamA)
+  select(teams_away_team_name) %>%
+  distinct()
 
-aaaid <- mlb_schedule(season = 2025, level_ids = "11")
+# AAA Schedule (2021-2025)
+aaaid <- bind_rows(
+  mlb_schedule(season = 2021, level_ids = "11"),
+  mlb_schedule(season = 2022, level_ids = "11"),
+  mlb_schedule(season = 2023, level_ids = "11"),
+  mlb_schedule(season = 2024, level_ids = "11"),
+  mlb_schedule(season = 2025, level_ids = "11")
+)
 aaateamH <- aaaid %>%
-  select(teams_home_team_name)
-aaateamH <- distinct(aaateamH)
+  select(teams_home_team_name) %>%
+  distinct()
 aaateamA <- aaaid %>%
-  select(teams_away_team_name)
-aaateamA <- distinct(aaateamA)
+  select(teams_away_team_name) %>%
+  distinct()
 
-fslid <- mlb_schedule(season = 2025, level_ids = "14")
-fslid <- fslid %>%
-  filter(teams_home_team_name == "Daytona Tortugas" |
-           teams_home_team_name == "Jupiter Hammerheads" |
-           teams_home_team_name == "Palm Beach Cardinals" |
-           teams_home_team_name == "St. Lucie Mets" |
-           teams_home_team_name == "Bradenton Marauders" |
-           teams_home_team_name == "Clearwater Threshers" |
-           teams_home_team_name == "Dunedin Blue Jays" |
-           teams_home_team_name == "Fort Myers Mighty Mussels" |
-           teams_home_team_name == "Lakeland Flying Tigers" |
-           teams_home_team_name == "Tampa Tarpons")
+# FSL Schedule (2021-2025)
+fslid <- bind_rows(
+  mlb_schedule(season = 2021, level_ids = "14"),
+  mlb_schedule(season = 2022, level_ids = "14"),
+  mlb_schedule(season = 2023, level_ids = "14"),
+  mlb_schedule(season = 2024, level_ids = "14"),
+  mlb_schedule(season = 2025, level_ids = "14")
+)  %>%
+  filter(gameday_type == "E" | gameday_type == "P")
 fslteamH <- fslid %>%
-  select(teams_home_team_name)
-fslteamH <- distinct(fslteamH)
+  select(teams_home_team_name) %>%
+  distinct()
 fslteamA <- fslid %>%
-  select(teams_away_team_name)
-fslteamA <- distinct(fslteamA)
+  select(teams_away_team_name) %>%
+  distinct()
 
-#sbid <- mlb_schedule(season = 2024, level_ids = "22")
-#sbteamH <- sbid %>%
-#  select(teams_home_team_name)
-#sbteamH <- distinct(sbteamH)
-#sbteamA <- sbid %>%
-#  select(teams_away_team_name)
-#sbteamA <- distinct(sbteamA)
-# AFL
-sbid <- mlb_schedule(2025,22) 
-sbid <- sbid %>%
-#  filter(teams_away_team_name == "Glendale Desert Dogs" |
-#         teams_away_team_name == "Mesa Solar Sox" |
-#         teams_away_team_name == "Peoria Javelinas" |
-#         teams_away_team_name == "Salt River Rafters" |
-#         teams_away_team_name == "Scottsdale Scorpions" |
-#         teams_away_team_name == "Surprise Saguaros") %>%#
-  filter(gameday_type == "E" | gameday_type == "P")
-sbteamH <- sbid %>%
-  select(teams_home_team_name)
-sbteamH <- distinct(sbteamH)
-sbteamA <- sbid %>%
-  select(teams_away_team_name)
-sbteamA <- distinct(sbteamA)
+# AFL Schedule (2023-2025)
+# sbid <- bind_rows(
+#   mlb_schedule(season = 2023, level_ids = "22"),
+#   mlb_schedule(season = 2024, level_ids = "22"),
+#   mlb_schedule(season = 2025, level_ids = "22")
+# ) %>%
+#   filter(gameday_type == "E" | gameday_type == "P")
+# sbteamH <- sbid %>%
+#   select(teams_home_team_name) %>%
+#   distinct()
+# sbteamA <- sbid %>%
+#   select(teams_away_team_name) %>%
+#   distinct()
 
 # UI Definition
 ui <- fluidPage(
   theme = bs_theme(version = 5, bootswatch = "flatly"),
-  titlePanel("2025 MLB/AAA/FSL Summary Cards"),
+  titlePanel("202-2025 Daily MLB/AAA/FSL Summary Cards"),
   sidebarLayout(
     sidebarPanel(
       width = 3,
       dateInput("date", "Date:"),
       selectizeInput("level", "Level:", 
-                     c("MLB", "AAA", "FSL", "AFL"),
+                     c("MLB", "AAA", "FSL"),
                      options = list(
                        placeholder = 'Select a level',
                        onInitialize = I('function() { this.setValue(""); }')
@@ -502,10 +536,10 @@ ui <- fluidPage(
       downloadButton("downloadPlot", "Download Card", class = "btn-info btn-block")
     ),
     mainPanel(
-      div(style = "width: 1200px; height: 800px; overflow: auto;",
-          plotOutput("combinedPlot", width = "100%", height = "100%")
+      div(style = "width: 1100px; height: 1100px; overflow: auto;",  # Increased from 1000px
+           plotOutput("combinedPlot", width = "100%", height = "100%")
       ),
-      tableOutput("boxscoreTable")  # Add this line for the boxscore
+      tableOutput("boxscoreTable")
     )
   )
 )
@@ -599,7 +633,9 @@ server <- function(input, output, session) {
     
     return(result)
   })
+  
   combinedPlot <- reactiveVal()
+  
   observeEvent(input$update1, {
     req(game_data())
     tryCatch({
@@ -609,25 +645,51 @@ server <- function(input, output, session) {
         showNotification("No data available for the selected pitcher.", type = "warning")
         return()
       }
+      game_pk <- unique(game$gamepk)[1]
+      bs <- fromJSON(paste0("https://statsapi.mlb.com/api/v1/game/", game_pk, "/boxscore"))
+      pitcher_id <- unique(game$`Pitcher ID`)[1]
       
-      break_plot <- break_plot(game) +
-        theme(legend.position = "none")
+      # Look for pitcher in both home and away teams
+      pitcher_team <- NULL
+      if(paste0("ID", pitcher_id) %in% names(bs$teams$away$players)) {
+        pitcher_team <- bs$teams$away$team$name
+      } else if(paste0("ID", pitcher_id) %in% names(bs$teams$home$players)) {
+        pitcher_team <- bs$teams$home$team$name
+      }
       
-      # Get boxscore data
+      if(is.null(pitcher_team)) {
+        mlb_team_logo <- textGrob("Logo not available", gp = gpar(col = "gray", fontsize = 12))
+      } else {
+        mlb_team_logo <- get_team_logo(pitcher_team)
+        if(is.null(mlb_team_logo)) {
+          mlb_team_logo <- textGrob("Logo not available", gp = gpar(col = "gray", fontsize = 12))
+        }
+      }
+      #mlb_team_logo <- get_team_logo(pitcher_team)
+      # Get plots and data
+      break_plot <- break_plot(game) + theme(legend.position = "none")
+      pitch_plots <- pitch_plot_split(game)
       boxscore_data <- getBoxScore(unique(game$gamepk[1]), unique(game$`Pitcher ID`[1]))
+      
+      # Create boxscore table
       boxscore_table <- tableGrob(boxscore_data, rows = NULL, theme = ttheme_minimal(
-        core = list(fg_params = list(hjust = 0.5, x = 0.5), bg_params = list(fill = "white")),
-        colhead = list(fg_params = list(hjust = 0.5, x = 0.5, fontface = "bold"), bg_params = list(fill = "#f0f0f0")),
-        rowhead = list(fg_params = list(hjust = 0.5, x = 0.5), bg_params = list(fill = "white"))
+        core = list(
+          fg_params = list(hjust = 0.5, x = 0.5),
+          bg_params = list(fill = "white"),
+          # Reduce the y padding to make the table more compact
+          y.padding = unit(4, "mm")  # Reduced from default
+        ),
+        colhead = list(
+          fg_params = list(hjust = 0.5, x = 0.5, fontface = "bold"),
+          bg_params = list(fill = "#f0f0f0"),
+          # Reduce the y padding for headers
+          y.padding = unit(4, "mm")  # Reduced from default
+        )
       ))
       
-      # Set a fixed total height for the boxscore table
       boxscore_table$heights <- unit(rep(1/(nrow(boxscore_data) + 1), nrow(boxscore_data) + 1), "npc")
       
-      # Get split pitch location plots
-      pitch_plots <- pitch_plot_split(game)
-      
-      # Create a formatted table
+      # Create summary table
       table_data <- summary_table(game)
       num_rows <- nrow(table_data)
       
@@ -637,21 +699,17 @@ server <- function(input, output, session) {
         rowhead = list(fg_params = list(hjust = 0.5, x = 0.5), bg_params = list(fill = "white"))
       ))
       
-      # Set a fixed total height for the table, adjusting row heights based on number of pitches
       total_height <- unit(1, "npc")
-      row_height <- total_height / (num_rows + 1)  # +1 for header row
+      row_height <- total_height / (num_rows + 1)
       table_plot$heights <- unit(rep(row_height, num_rows + 1), "npc")
+      table_plot$widths <- unit(c(0.12, 0.05, 0.05, 0.07, 0.08, 0.05, 0.07, 0.07, 0.07, 0.09, 0.09, 0.09), "npc")
       
-      # Adjust column widths
-      table_plot$widths <- unit(c(0.1, 0.06, 0.06, 0.08, 0.1, 0.06, 0.08, 0.08, 0.08, 0.1, 0.1, 0.1), "npc")
-      
-      # Add alternating row colors
       for(i in seq(2, nrow(table_plot), 2)) {
         table_plot$grobs[[i]]$gp$fill <- "#f9f9f9"
       }
       
+      # Get player image
       id <- as.character(game$`Pitcher ID`[1])
-      
       mlb_url <- paste0("https://midfield.mlbstatic.com/v1/people/", id, "/mlb/300?circle=false")
       milb_url <- paste0("https://midfield.mlbstatic.com/v1/people/", id, "/milb/300?circle=false")
       
@@ -660,38 +718,38 @@ server <- function(input, output, session) {
         img_result <- download_and_process_image(milb_url)
       }
       
-      if (!is.null(img_result)) {
-        img_grob <- rasterGrob(img_result$img, interpolate = TRUE)
+      img_grob <- if (!is.null(img_result)) {
+        rasterGrob(img_result$img, interpolate = TRUE)
       } else {
-        img_grob <- textGrob("Image not available", gp = gpar(col = "red", fontsize = 20))
+        textGrob("Image not available", gp = gpar(col = "red", fontsize = 20))
       }
       
-      pitch_colors <- c(
-    "Four-Seam Fastball"= "#FF4136", 
-    "Sinker"= "#FF851B",              
-    "Cutter"= "#FFDC00",              
-    "Changeup"= "#2ECC40",            
-    "Slider"= "#0074D9",              
-    "Sweeper"= "#ED68ED",             
-    "Curveball"= "#B10DC9",           
-    "Splitter"= "#01FF70",           
-    "Knuckle Curve"= "#85144b",       
-    "Slurve"= "#3D9970",              
-    "Knuckle Ball"= "#39CCCC",        
-    "Forkball"= "#F012BE",           
-    "Eephus"= "#AAAAAA",              
-    "Fastball"= "#7FDBFF",            
-    "Slow Curve"= "#DDDDDD",          
-    "Screwball"= "#FF69B4"            
-)
-      # Create the rolling TimStuff+ graph
+      # Create rolling TimStuff+ plot
       rolling_data <- rolling_timstuff()
+      pitch_colors <- c(
+        "Four-Seam Fastball"= "#FF4136", 
+        "Sinker"= "#FF851B",              
+        "Cutter"= "#FFDC00",              
+        "Changeup"= "#2ECC40",            
+        "Slider"= "#0074D9",              
+        "Sweeper"= "#ED68ED",             
+        "Curveball"= "#B10DC9",           
+        "Splitter"= "#01FF70",           
+        "Knuckle Curve"= "#85144b",       
+        "Slurve"= "#3D9970",              
+        "Knuckle Ball"= "#39CCCC",        
+        "Forkball"= "#F012BE",           
+        "Eephus"= "#AAAAAA",              
+        "Fastball"= "#7FDBFF",            
+        "Slow Curve"= "#DDDDDD",          
+        "Screwball"= "#FF69B4"            
+      )
+      
       timstuff_plot <- ggplot(rolling_data, aes(x = pitch_number, y = rolling_timstuff, color = pitch_name)) +
         geom_line(size = 1, na.rm = TRUE) +
         geom_point(size = 1, na.rm = TRUE) +
         scale_color_manual(values = pitch_colors) +
         theme_minimal() +
-        ### Workaround to not show anything but keep graph
         labs(title = if(any(rolling_data$pitch_number >= 5)) "5-Pitch Rolling TimStuff+" else "5-Pitch Rolling TimStuff+",
              x = "Pitch Number", y = "TimStuff+") +
         scale_y_continuous(limits = c(70, 130), na.value = NA) +
@@ -702,7 +760,6 @@ server <- function(input, output, session) {
           panel.grid.major.x = element_line(color = "gray", size = 0.5)
         )
       
-      # If there's no data at all, display a message
       if(nrow(rolling_data) == 0) {
         timstuff_plot <- ggplot() + 
           theme_void() +
@@ -717,6 +774,7 @@ server <- function(input, output, session) {
         paste(input$pitcher, format(input$date, "%m/%d/%y"), "Summary Card by @TimStats"),
         gp = gpar(fontsize = 16, fontface = "bold")
       )
+      
       data_source_text <- textGrob(
         "Data: MLB",
         gp = gpar(fontsize = 8),
@@ -725,7 +783,7 @@ server <- function(input, output, session) {
         just = c("right", "bottom")
       )
       
-      # Create a horizontal legend
+      # Create legend
       legend <- if(nrow(rolling_data) > 0) {
         get_legend(
           ggplot(rolling_data, aes(x = pitch_number, y = rolling_timstuff, color = pitch_name)) +
@@ -738,69 +796,71 @@ server <- function(input, output, session) {
             guides(color = guide_legend(nrow = 1))
         )
       } else {
-        ggplotGrob(ggplot() + theme_void())  # Empty legend if no data
+        ggplotGrob(ggplot() + theme_void())
       }
       
-      # Combine all plots
+      # NEW LAYOUT: Combine all plots
       combined <- grid.arrange(
-        # Row 1: Picture and Rolling TimStuff+ graph
+        # Row 1: Headshot - Title - Team Logo
+        arrangeGrob(
+          img_grob,
+          title_text,
+          mlb_team_logo,
+          ncol = 3,
+          widths = c(1, 2, 1)
+        ),
+        
+        # Row 2: TimStuff+ (2/3) and boxscore (1/3)
         arrangeGrob(
-          arrangeGrob(
-            img_grob,
-            title_text,
-            ncol = 1,
-            heights = c(4, 1)
-          ),
           timstuff_plot,
+          boxscore_table,
           ncol = 2,
-          widths = c(1, 1)
+          widths = c(2, 1)
         ),
         
-        # Row 2: Two location graphs and movement graph
+        # Row 3: Three plots in one row
         arrangeGrob(
           pitch_plots$lhb,
           pitch_plots$rhb,
           break_plot,
           ncol = 3,
-          widths = c(1, 1, 1.2)
+          widths = c(1, 1, 1)
         ),
         
-        # Row 3: Legend
+        # Row 4: Legend
         legend,
         
-        # Row 4: Horizontal boxscore table
-        tableGrob(
-          boxscore_data,
-          rows = NULL,
-          cols = colnames(boxscore_data),
-          theme = ttheme_minimal(
-            core = list(fg_params = list(hjust = 0.5, x = 0.5), bg_params = list(fill = "white")),
-            colhead = list(fg_params = list(hjust = 0.5, x = 0.5, fontface = "bold"), bg_params = list(fill = "#f0f0f0"))
-          )
-        ),
-        
         # Row 5: Pitch summary table
         table_plot,
         
-        # Row 6: Data source text
-        data_source_text,
-        
-        # Layout parameters
-        nrow = 6,
-        heights = c(1.2, 1.5, 0.1, 0.3, 1, 0.05)
+        # Adjust the relative heights
+        nrow = 5,
+        heights = c(0.8, 0.9, 1.2, 0.2, 1)
       )
+      
+      # Add padding to the combined plot
+     # padded_plot <- gtable_add_padding(combined, padding = unit(c(30, 30, 30, 30), "points"))  # top, right, bottom, left padding
+      
+      # Update the reactive value with the padded plot
       combinedPlot(combined)
       
+      # Update the rendering to use the padded plot
       output$combinedPlot <- renderPlot({
+        par(mar = c(2, 2, 2, 2))  # Add margins (bottom, left, top, right)
         grid.draw(combinedPlot())
-      }, width = 1200, height = 800)  # Fixed size output
+      }, width = 1000, height = 1000, bg = "white")
       
+      # For download
       output$downloadPlot <- downloadHandler(
         filename = function() {
           paste("baseball_card_", Sys.Date(), ".png", sep = "")
         },
         content = function(file) {
-          ggsave(file, plot = combinedPlot(), width = 18, height = 12, dpi = 300, units = "in")
+          ggsave(file, plot = combinedPlot(), 
+                 width = 15, height = 15,   # Increased from 15
+                 dpi = 300, units = "in",
+                 device = "png",
+                 bg = "white")
         }
       )