diff --git a/client/scripts/dup-baseline.json b/client/scripts/dup-baseline.json
index 652cd2c7a..0967ef424 100644
--- a/client/scripts/dup-baseline.json
+++ b/client/scripts/dup-baseline.json
@@ -1,37 +1 @@
-{
-  "src/components/Admin/AddonManager.tsx": 23,
-  "src/components/Files/FileManagerMarkdownPreviewModal.tsx": 19,
-  "src/components/Files/FileManagerPdfPreviewModal.tsx": 19,
-  "src/components/Map/MapView.tsx": 56,
-  "src/components/Map/MapViewGL.tsx": 51,
-  "src/components/Map/ReservationOverlay.tsx": 75,
-  "src/components/Map/RouteCalculator.ts": 27,
-  "src/components/Map/reservationsMapbox.ts": 72,
-  "src/components/Packing/ApplyTemplateButton.tsx": 19,
-  "src/components/Packing/PackingListPanelHeader.tsx": 16,
-  "src/components/Planner/AddressInput.tsx": 38,
-  "src/components/Planner/AirportSelect.tsx": 44,
-  "src/components/Planner/DayPlanSidebar.tsx": 326,
-  "src/components/Planner/LocationSelect.tsx": 56,
-  "src/components/Planner/ReservationModal.tsx": 26,
-  "src/components/Planner/TransportModal.tsx": 26,
-  "src/components/Studio/StudioInspector.tsx": 19,
-  "src/components/Studio/StudioTravelInspector.tsx": 19,
-  "src/components/Studio/TravelElements.tsx": 10,
-  "src/components/Studio/roadRoute.ts": 17,
-  "src/components/shared/CustomTimePicker.tsx": 24,
-  "src/mobile/screens/admin/MAdminAddonManager.tsx": 23,
-  "src/mobile/screens/admin/MAdminStoragePanel.tsx": 38,
-  "src/mobile/screens/trip/sheets/MReservationSheet.tsx": 79,
-  "src/mobile/screens/trip/sheets/MTransportFormSheet.tsx": 139,
-  "src/mobile/screens/trip/tabs/MBookingsTab.tsx": 88,
-  "src/mobile/screens/trip/tabs/MTransportsTab.tsx": 90,
-  "src/mobile/screens/vacay/MVacayInviteSheet.tsx": 21,
-  "src/mobile/screens/vacay/MVacayShareSheet.tsx": 21,
-  "src/pages/TripPlannerPage.tsx": 82,
-  "src/pages/admin/GoogleOptions.tsx": 13,
-  "src/pages/admin/TrekApiCard.tsx": 14,
-  "src/pages/atlas/AtlasCountrySearch.tsx": 38,
-  "src/store/slices/budgetSlice.ts": 16,
-  "src/store/slices/remoteEventHandler.ts": 17
-}
+{}
diff --git a/client/scripts/eslint-baseline.json b/client/scripts/eslint-baseline.json
index 3f80499fa..24b467f14 100644
--- a/client/scripts/eslint-baseline.json
+++ b/client/scripts/eslint-baseline.json
@@ -2,18 +2,18 @@
   "src": {
     "@typescript-eslint/no-explicit-any": 155,
     "@typescript-eslint/no-unused-expressions": 2,
-    "@typescript-eslint/no-unused-vars": 184,
+    "@typescript-eslint/no-unused-vars": 159,
     "no-empty": 19,
     "no-useless-assignment": 7,
     "no-useless-escape": 1,
     "preserve-caught-error": 53,
-    "react-hooks/exhaustive-deps": 124,
+    "react-hooks/exhaustive-deps": 123,
     "react-refresh/only-export-components": 47,
     "unused-disable-directive": 6
   },
   "suppressed": {
     "@typescript-eslint/no-explicit-any": 44,
-    "react-hooks/exhaustive-deps": 47
+    "react-hooks/exhaustive-deps": 46
   },
   "tests": {
     "@typescript-eslint/no-explicit-any": 492,
diff --git a/client/scripts/rtl-baseline.json b/client/scripts/rtl-baseline.json
index a18e7c7cc..5c270ae28 100644
--- a/client/scripts/rtl-baseline.json
+++ b/client/scripts/rtl-baseline.json
@@ -20,52 +20,38 @@
   "components/Journey/JourneyEntryCover.tsx": 1,
   "components/Journey/JourneyMap.tsx": 1,
   "components/Journey/JourneyMapGL.tsx": 2,
-  "components/Journey/journeyPhotoLayer.ts": 1,
   "components/Journey/MobileEntryView.tsx": 1,
   "components/Journey/PhotoLightbox.tsx": 3,
+  "components/Journey/journeyPhotoLayer.ts": 1,
   "components/Layout/Navbar.tsx": 1,
   "components/Layout/OfflineBanner.tsx": 1,
   "components/Map/DawarichTrailPill.tsx": 1,
-  "components/Map/hazardPopup.css": 2,
-  "components/Map/hazardPopup.ts": 1,
   "components/Map/LocationButton.tsx": 1,
-  "components/Map/locationMarkerMapbox.ts": 2,
   "components/Map/MapTogglePill.tsx": 1,
   "components/Map/MapView.tsx": 6,
   "components/Map/MapViewGL.tsx": 8,
-  "components/Map/nightPauseMarker.ts": 4,
   "components/Map/NightPauseTooltip.tsx": 1,
   "components/Map/PlaceHoverCard.tsx": 1,
   "components/Map/PoiCategoryPill.tsx": 1,
+  "components/Map/hazardPopup.css": 2,
+  "components/Map/hazardPopup.ts": 1,
+  "components/Map/locationMarkerMapbox.ts": 2,
+  "components/Map/nightPauseMarker.ts": 4,
   "components/Map/ratingBadge.ts": 1,
+  "components/PDF/TripPDF.tsx": 8,
+  "components/PDF/tripMapImage.ts": 1,
   "components/Packing/PackingListPanelBagCard.tsx": 1,
   "components/Packing/PackingListPanelCategoryGroup.tsx": 3,
   "components/Packing/PackingListPanelItemRow.tsx": 2,
   "components/Packing/PackingShareControl.tsx": 3,
-  "components/PDF/tripMapImage.ts": 1,
-  "components/PDF/TripPDF.tsx": 8,
-  "components/Planner/bookings/BookingsTimeline.tsx": 24,
   "components/Planner/DayDetailPanel.tsx": 1,
   "components/Planner/PlaceInspector.tsx": 1,
   "components/Planner/TransitSearchPanel.tsx": 3,
+  "components/Planner/bookings/BookingsTimeline.tsx": 24,
   "components/Roadtrip/AnchoredPopover.tsx": 2,
   "components/Settings/IntegrationsTab.tsx": 2,
   "components/Settings/PluginSettingsTab.tsx": 2,
   "components/Settings/ToggleSwitch.tsx": 1,
-  "components/shared/ContextMenu.tsx": 3,
-  "components/shared/CustomDateTimePicker.tsx": 2,
-  "components/shared/CustomSelect.tsx": 4,
-  "components/shared/CustomTimePicker.tsx": 3,
-  "components/shared/DetailShell.tsx": 1,
-  "components/shared/dialogParts.tsx": 1,
-  "components/shared/ElevationProfile.tsx": 2,
-  "components/shared/NavigationMenu.tsx": 2,
-  "components/shared/PlaceAvatarUpload.tsx": 3,
-  "components/shared/PublicLanguagePicker.tsx": 1,
-  "components/shared/SlidingTabs.tsx": 3,
-  "components/shared/StarRating.tsx": 3,
-  "components/shared/Toast.tsx": 1,
-  "components/shared/Tooltip.tsx": 2,
   "components/Studio/BookSheetsView.tsx": 3,
   "components/Studio/PageNumbers.tsx": 1,
   "components/Studio/PeerCursors.tsx": 1,
@@ -78,11 +64,25 @@
   "components/Studio/StudioSidebar.tsx": 3,
   "components/Studio/TravelElements.tsx": 4,
   "components/Studio/TravelPreview.tsx": 1,
-  "components/SystemNotices/releaseNotice.css": 2,
   "components/SystemNotices/ReleaseNoticeVisuals.tsx": 3,
+  "components/SystemNotices/releaseNotice.css": 2,
   "components/Vacay/VacayCalendar.tsx": 3,
   "components/Vacay/VacayMonthCard.tsx": 7,
   "components/Vacay/VacaySettings.tsx": 1,
+  "components/shared/ContextMenu.tsx": 3,
+  "components/shared/CustomDateTimePicker.tsx": 2,
+  "components/shared/CustomSelect.tsx": 4,
+  "components/shared/CustomTimePicker.tsx": 3,
+  "components/shared/DetailShell.tsx": 1,
+  "components/shared/ElevationProfile.tsx": 2,
+  "components/shared/NavigationMenu.tsx": 2,
+  "components/shared/PlaceAvatarUpload.tsx": 3,
+  "components/shared/PublicLanguagePicker.tsx": 1,
+  "components/shared/SlidingTabs.tsx": 3,
+  "components/shared/StarRating.tsx": 3,
+  "components/shared/Toast.tsx": 1,
+  "components/shared/Tooltip.tsx": 2,
+  "components/shared/dialogParts.tsx": 1,
   "help/contexts/tripMap.ts": 1,
   "hooks/useAnchoredPosition.ts": 3,
   "hooks/useElementRect.ts": 3,
@@ -91,22 +91,22 @@
   "mobile/screens/dashboard/MDashboard.tsx": 1,
   "mobile/screens/journey/MJourneyDetail.tsx": 3,
   "mobile/screens/journey/MJourneyEntrySheet.tsx": 1,
-  "mobile/screens/trip/map/MMapArea.tsx": 3,
   "mobile/screens/trip/MTripShell.tsx": 3,
+  "mobile/screens/trip/map/MMapArea.tsx": 3,
   "mobile/screens/trip/tabs/MCollabPolls.tsx": 1,
   "mobile/screens/trip/tabs/MFileLightbox.tsx": 2,
   "mobile/screens/vacay/MVacay.tsx": 1,
   "mobile/screens/vacay/MVacayMonth.tsx": 1,
-  "pages/admin/AdminNotificationsTab.tsx": 1,
-  "pages/admin/AdminSettingsTab.tsx": 1,
-  "pages/atlas/AtlasLayerToggle.tsx": 1,
   "pages/AtlasPage.tsx": 2,
   "pages/JourneyDetailPage.tsx": 1,
   "pages/JourneyPublicPage.tsx": 3,
   "pages/LoginPage.tsx": 23,
-  "pages/sharedTrip/SharedMap.tsx": 4,
-  "pages/TripPlannerPage.tsx": 13,
+  "pages/TripPlannerPage.tsx": 11,
   "pages/VacayPage.tsx": 1,
+  "pages/admin/AdminNotificationsTab.tsx": 1,
+  "pages/admin/AdminSettingsTab.tsx": 1,
+  "pages/atlas/AtlasLayerToggle.tsx": 1,
+  "pages/sharedTrip/SharedMap.tsx": 4,
   "styles/collections.css": 1,
   "styles/studio.css": 7,
   "utils/formatters.ts": 1,
diff --git a/client/scripts/size-baseline.json b/client/scripts/size-baseline.json
index 7ec3948ff..185f4cd1a 100644
--- a/client/scripts/size-baseline.json
+++ b/client/scripts/size-baseline.json
@@ -5,18 +5,18 @@
   "src/components/Admin/AdminPluginsPanel.tsx": 1667,
   "src/components/Budget/CostsPanel.test.tsx": 2854,
   "src/components/Budget/CostsPanel.tsx": 1854,
-  "src/components/Map/MapView.tsx": 1526,
+  "src/components/Map/MapView.tsx": 1461,
   "src/components/Map/MapViewGL.test.tsx": 2920,
-  "src/components/Map/MapViewGL.tsx": 2607,
-  "src/components/Map/RouteCalculator.ts": 1196,
+  "src/components/Map/MapViewGL.tsx": 2549,
+  "src/components/Map/RouteCalculator.ts": 1195,
   "src/components/PDF/TripPDF.tsx": 1097,
   "src/components/Planner/DayDetailPanel.test.tsx": 2333,
   "src/components/Planner/DayPlanSidebar.test.tsx": 5403,
-  "src/components/Planner/DayPlanSidebar.tsx": 3214,
+  "src/components/Planner/DayPlanSidebar.tsx": 3060,
   "src/components/Planner/PlaceFormModal.test.tsx": 2864,
   "src/components/Planner/PlaceFormModal.tsx": 1250,
   "src/components/Planner/PlaceInspector.tsx": 1308,
-  "src/components/Studio/TravelElements.tsx": 1747,
+  "src/components/Studio/TravelElements.tsx": 1738,
   "src/components/Studio/autoLayout.ts": 1691,
   "src/components/Studio/bookTemplates.data.ts": 1309,
   "src/components/Studio/countryShapes.ts": 2595,
@@ -24,7 +24,7 @@
   "src/mobile/screens/admin/MAdminPluginsPanel.tsx": 1507,
   "src/pages/JourneyDetailPage.test.tsx": 4030,
   "src/pages/LoginPage.tsx": 1348,
-  "src/pages/TripPlannerPage.tsx": 1213,
+  "src/pages/TripPlannerPage.tsx": 1179,
   "src/pages/TripPlannerPage.wiring.test.tsx": 2049,
   "src/pages/atlas/useAtlas.ts": 1287,
   "src/pages/tripPlanner/useTripPlanner.roadtrip.test.tsx": 3531,