diff --git a/.vscode/settings.json b/.vscode/settings.json
index 08f2079cd..4118c2056 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -54,6 +54,7 @@
     "dbid",
     "Ddpf",
     "Ddsd",
+    "deadrail",
     "debugflags",
     "deburr",
     "decalmask",
diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json
index fa2fae0e7..27d7e1b20 100644
--- a/packages/i18n/strings/en.json
+++ b/packages/i18n/strings/en.json
@@ -881,8 +881,8 @@
           "view_range": {
             "camo": "Camo",
             "percentage": "%s1%",
-            "desert_sands": "Desert Sands",
-            "new_bay": "New Bay"
+            "ghost_factory": "Ghost Factory",
+            "dead_rail": "Dead Rail"
           }
         },
 
diff --git a/packages/website/public/assets/images/tankopedia/visualizers/range/dead-rail.png b/packages/website/public/assets/images/tankopedia/visualizers/range/dead-rail.png
new file mode 100644
index 000000000..817a2b283
Binary files /dev/null and b/packages/website/public/assets/images/tankopedia/visualizers/range/dead-rail.png differ
diff --git a/packages/website/public/assets/images/tankopedia/visualizers/range/desert-sands-full.webp b/packages/website/public/assets/images/tankopedia/visualizers/range/desert-sands-full.webp
deleted file mode 100644
index 7cd69cb17..000000000
Binary files a/packages/website/public/assets/images/tankopedia/visualizers/range/desert-sands-full.webp and /dev/null differ
diff --git a/packages/website/public/assets/images/tankopedia/visualizers/range/desert-sands.webp b/packages/website/public/assets/images/tankopedia/visualizers/range/desert-sands.webp
deleted file mode 100644
index 602d7f5f9..000000000
Binary files a/packages/website/public/assets/images/tankopedia/visualizers/range/desert-sands.webp and /dev/null differ
diff --git a/packages/website/public/assets/images/tankopedia/visualizers/range/ghost-factory.png b/packages/website/public/assets/images/tankopedia/visualizers/range/ghost-factory.png
new file mode 100644
index 000000000..8c8b272c8
Binary files /dev/null and b/packages/website/public/assets/images/tankopedia/visualizers/range/ghost-factory.png differ
diff --git a/packages/website/public/assets/images/tankopedia/visualizers/range/new-bay-full.webp b/packages/website/public/assets/images/tankopedia/visualizers/range/new-bay-full.webp
deleted file mode 100644
index 117430af6..000000000
Binary files a/packages/website/public/assets/images/tankopedia/visualizers/range/new-bay-full.webp and /dev/null differ
diff --git a/packages/website/public/assets/images/tankopedia/visualizers/range/new-bay.webp b/packages/website/public/assets/images/tankopedia/visualizers/range/new-bay.webp
deleted file mode 100644
index 71c53ad0d..000000000
Binary files a/packages/website/public/assets/images/tankopedia/visualizers/range/new-bay.webp and /dev/null differ
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx
index 56545abfb..5913806f4 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx
@@ -28,7 +28,7 @@ export function Crew({ stats }: StatsAcceptorProps) {
   const commanderMastery = 1 + provisionCrewBonus;
 
   return (
-    <Flex direction="column" gap="2">
+    <Flex direction="column" gap="2" width="16rem">
       <Flex gap="2" align="center">
         <Heading size="5">
           {strings.website.tools.tankopedia.crew.title}
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx
index 37a971ba4..42c469f3f 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx
@@ -57,7 +57,7 @@ export function Firepower({ stats }: StatsAcceptorProps) {
   }, [penetrationDistance]);
 
   return (
-    <Flex direction="column" gap="2">
+    <Flex direction="column" gap="2" width="16rem">
       <Flex align="center" gap="4">
         <Heading size="5">
           {strings.website.tools.tankopedia.firepower.title}
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Maneuverability.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Maneuverability.tsx
index f61ac9b04..c23ce3b1b 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Maneuverability.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Maneuverability.tsx
@@ -11,7 +11,7 @@ export function Maneuverability({ stats }: StatsAcceptorProps) {
   const { strings } = useLocale();
 
   return (
-    <Flex direction="column" gap="2">
+    <Flex direction="column" gap="2" width="16rem">
       <Heading size="5">
         {strings.website.tools.tankopedia.maneuverability.title}
       </Heading>
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/RicochetVisualizer.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/RicochetVisualizer.tsx
index 328203712..801c0db20 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/RicochetVisualizer.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/RicochetVisualizer.tsx
@@ -13,7 +13,7 @@ export function RicochetVisualizer({ stats }: StatsAcceptorProps) {
   const container = useRef<HTMLDivElement>(null);
   const normalization = degToRad(stats.shellNormalization);
   const ricochet = degToRad(stats.shellRicochet ?? 90);
-  const [angle, setAngle] = useState(degToRad(45));
+  const [angle, setAngle] = useState(degToRad(-25));
   const doesRicochet = Math.abs(angle) >= ricochet;
   const effectiveAngle = doesRicochet
     ? -angle + Math.PI
@@ -226,7 +226,7 @@ export function RicochetVisualizer({ stats }: StatsAcceptorProps) {
             {doesRicochet
               ? '-'
               : literals(strings.common.units.percentage, [
-                  (100 / Math.cos(effectiveAngle)).toFixed(2),
+                  (100 / Math.cos(effectiveAngle)).toFixed(0),
                 ])}
           </Code>
         </Flex>
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Survivability.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Survivability.tsx
index 6ca40635a..9798c129e 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Survivability.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Survivability.tsx
@@ -9,7 +9,7 @@ export function Survivability({ stats }: StatsAcceptorProps) {
   const { strings } = useLocale();
 
   return (
-    <Flex direction="column" gap="2">
+    <Flex direction="column" gap="2" width="16rem">
       <Heading size="5">
         {strings.website.tools.tankopedia.survivability.title}
       </Heading>
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/ViewRangeVisualizer.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/ViewRangeVisualizer.tsx
index 2864ba246..10dd61df0 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/ViewRangeVisualizer.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/ViewRangeVisualizer.tsx
@@ -8,13 +8,13 @@ import type { StatsAcceptorProps } from './HullTraverseVisualizer';
 
 const maps = [
   {
-    id: 'new-bay',
-    string: 'new_bay',
+    id: 'ghost-factory',
+    string: 'ghost_factory',
     size: 512,
   },
   {
-    id: 'desert-sands',
-    string: 'desert_sands',
+    id: 'dead-rail',
+    string: 'dead_rail',
     size: 512,
   },
 ] as const;
@@ -48,11 +48,22 @@ export function ViewRangeVisualizer({ stats }: StatsAcceptorProps) {
         width="100%"
         height="100%"
         style={{
-          backgroundImage: `url(/assets/images/tankopedia/visualizers/range/${map.id}.webp)`,
+          backgroundImage: `url(/assets/images/tankopedia/visualizers/range/${map.id}.png)`,
           backgroundSize: 'cover',
           backgroundPosition: 'center',
         }}
       >
+        <Box
+          position="absolute"
+          top="0"
+          left="0"
+          width="100%"
+          height="100%"
+          style={{
+            background: Var('black-a5'),
+          }}
+        />
+
         <Flex
           ref={range}
           position="absolute"
@@ -87,7 +98,7 @@ export function ViewRangeVisualizer({ stats }: StatsAcceptorProps) {
         gap="3"
         align="center"
         style={{
-          backgroundColor: Var('black-a8'),
+          backgroundColor: Var('black-a5'),
           backdropFilter: 'blur(4rem)',
         }}
       >
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx
index acd15b239..0558e8b9b 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx
@@ -87,17 +87,15 @@ export function Characteristics() {
       gap="8"
       direction={{
         initial: 'column',
-        md: 'row',
+        lg: 'row',
       }}
     >
-      <Flex direction="column" gap="8" style={{ flex: 1 }}>
-        <Firepower stats={stats} />
-        <Crew stats={stats} />
-      </Flex>
+      <Firepower stats={stats} />
+      <Maneuverability stats={stats} />
 
-      <Flex direction="column" gap="8" style={{ flex: 1 }}>
-        <Maneuverability stats={stats} />
+      <Flex direction="column" gap="8">
         <Survivability stats={stats} />
+        <Crew stats={stats} />
       </Flex>
     </Flex>
   );
diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/index.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/index.tsx
index 193d60475..2ea24988a 100644
--- a/packages/website/src/components/Tankopedia/CharacteristicsSection/index.tsx
+++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/index.tsx
@@ -37,7 +37,7 @@ export function CharacteristicsSection() {
 
           <Flex
             flexGrow="1"
-            maxWidth={{ initial: '20rem', md: '40rem' }}
+            maxWidth={{ initial: '20rem', md: '54rem' }}
             direction="column"
             gap="6"
             width="100%"