diff --git a/src/app/tools/tankopedia/[id]/components/Control.tsx b/src/app/tools/tankopedia/[id]/components/Control.tsx
index 0bbdd0caa..6e715ad08 100644
--- a/src/app/tools/tankopedia/[id]/components/Control.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Control.tsx
@@ -11,7 +11,7 @@ import { useAwait } from '../../../../../hooks/useAwait';
 import * as Duel from '../../../../../stores/duel';
 import * as TankopediaEphemeral from '../../../../../stores/tankopediaEphemeral';
 
-const initialPosition = [0, 5, -16] as const;
+const initialPosition = [0, 6, -32] as const;
 const poseDistances: Record<Pose, number> = {
   [Pose.HullDown]: 15,
   [Pose.FaceHug]: 5,
diff --git a/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx b/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx
index 3b0baffff..a44d9d4f7 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/HeroSection.tsx
@@ -53,72 +53,87 @@ export function HeroSection({ id }: HeroSectionProps) {
   }, []);
 
   return (
-    <Box
-      style={{
-        background: isFullScreen
-          ? Var('color-background')
-          : Var('color-surface'),
-        zIndex: isFullScreen ? 2 : undefined,
-      }}
-      height={
-        isFullScreen ? '100vh' : `calc(100vh - ${NAVBAR_HEIGHT}px - 8rem)`
-      }
-      width={isFullScreen ? '100vw' : undefined}
-      position={isFullScreen ? 'fixed' : 'relative'}
-      top={isFullScreen ? '0' : undefined}
-      left={isFullScreen ? '0' : undefined}
-    >
-      <Flex
-        position="absolute"
-        width="100%"
-        height="100%"
-        align="center"
-        direction="column"
-        mt="7"
-      >
-        <Heading
-          weight="bold"
-          size={{ initial: '8', xs: '9' }}
-          color={treeColor}
-        >
-          <Flex align="center" gap="3">
-            <Icon width="0.75em" height="0.75em" />
-            {tank.name}
-          </Flex>
-        </Heading>
-        <Text color="gray" weight="light" mt="1">
-          BlitzKit Tankopedia
-        </Text>
-      </Flex>
-
+    <Flex justify="center" style={{ backgroundColor: Var('color-surface') }}>
       <Box
-        position="absolute"
-        width="100%"
-        height="100%"
-        className="tank-sandbox-container"
+        style={{
+          backgroundColor: isFullScreen
+            ? Var('color-background')
+            : Var('color-surface'),
+          zIndex: isFullScreen ? 2 : undefined,
+        }}
+        height={
+          isFullScreen ? '100vh' : `calc(100vh - ${NAVBAR_HEIGHT}px - 8rem)`
+        }
+        maxHeight="40rem"
+        maxWidth="120rem"
+        flexGrow="1"
+        width={isFullScreen ? '100vw' : undefined}
+        position={isFullScreen ? 'fixed' : 'relative'}
+        top={isFullScreen ? '0' : undefined}
+        left={isFullScreen ? '0' : undefined}
       >
-        <Box width="100%" height="100%" position="absolute">
-          <Box width="100%" height="100%">
-            <TankSandboxLoader
-              id={id}
-              display={dummyLoader ? 'flex' : 'none'}
-            />
-
-            <Suspense
-              fallback={
-                <TankSandboxLoader
-                  id={id}
-                  display={dummyLoader ? 'none' : 'flex'}
-                />
-              }
+        <Flex
+          position="absolute"
+          justify={{ initial: 'center', md: 'start' }}
+          width="100%"
+          mt={{ initial: '6', md: '-8' }}
+          top={{ initial: '0', md: '50%' }}
+          left={{ initial: '-4', md: '0' }}
+          pl={{ initial: '0', md: '8' }}
+        >
+          <Flex direction="column" align={{ initial: 'center', md: 'start' }}>
+            <Heading
+              weight="bold"
+              size={{ initial: '8', xl: '9' }}
+              wrap="nowrap"
+              color={treeColor}
             >
-              <TankSandbox ref={canvas} thicknessRange={thicknessRange} />
-            </Suspense>
-          </Box>
+              <Flex align="center" gap="3">
+                <Icon width="0.8em" height="0.8em" />
+                {tank.name}
+              </Flex>
+            </Heading>
 
-          <Options canvas={canvas} thicknessRange={thicknessRange} />
+            <Text
+              color="gray"
+              size="3"
+              weight="light"
+              ml={{ initial: '0', md: '7', xl: '9' }}
+            >
+              BlitzKit Tankopedia
+            </Text>
+          </Flex>
+        </Flex>
+
+        <Box
+          position="absolute"
+          width="100%"
+          height="100%"
+          className="tank-sandbox-container"
+        >
+          <Box width="100%" height="100%" position="absolute">
+            <Box width="100%" height="100%">
+              <TankSandboxLoader
+                id={id}
+                display={dummyLoader ? 'flex' : 'none'}
+              />
+
+              <Suspense
+                fallback={
+                  <TankSandboxLoader
+                    id={id}
+                    display={dummyLoader ? 'none' : 'flex'}
+                  />
+                }
+              >
+                <TankSandbox ref={canvas} thicknessRange={thicknessRange} />
+              </Suspense>
+            </Box>
+
+            <Options canvas={canvas} thicknessRange={thicknessRange} />
+          </Box>
         </Box>
       </Box>
-    </Box>
+    </Flex>
   );
 }
diff --git a/src/app/tools/tankopedia/[id]/components/Model/MetaSection/index.tsx b/src/app/tools/tankopedia/[id]/components/Model/MetaSection/index.tsx
index 5a8718d69..de21f6ff3 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/MetaSection/index.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/MetaSection/index.tsx
@@ -1,6 +1,8 @@
-import { Code, Flex } from '@radix-ui/themes';
+import { ChevronLeftIcon, MixIcon } from '@radix-ui/react-icons';
+import { Button, Code, Flex } from '@radix-ui/themes';
 import { Suspense } from 'react';
 import { classIcons } from '../../../../../../../components/ClassIcon';
+import { Link } from '../../../../../../../components/Link';
 import { asset } from '../../../../../../../core/blitzkit/asset';
 import strings from '../../../../../../../lang/en-US.json';
 import * as App from '../../../../../../../stores/app';
@@ -11,27 +13,48 @@ import { VotesSkeleton } from './components/VotesSkeleton';
 
 export function MetaSection() {
   const developerMode = App.useDeferred(false, (state) => state.developerMode);
-  const tank = Duel.use((state) => state.protagonist.tank);
-  const ClassIcon = classIcons[tank.class];
+  const protagonist = Duel.use((state) => state.protagonist.tank);
+  const ClassIcon = classIcons[protagonist.class];
+  const antagonist = Duel.use((state) => state.antagonist.tank);
+  const compareTanks =
+    protagonist.id === antagonist.id
+      ? [protagonist.id]
+      : [protagonist.id, antagonist.id];
 
   return (
     <Flex justify="center" align="center">
       <Flex direction="column" align="center" gap="6">
+        <Flex gap="2">
+          <Link href="/tools/tankopedia">
+            <Button variant="outline">
+              <ChevronLeftIcon />
+              Back
+            </Button>
+          </Link>
+
+          <Link href={`/tools/compare?tanks=${compareTanks.join('%2C')}`}>
+            <Button>
+              <MixIcon />
+              Compare
+            </Button>
+          </Link>
+        </Flex>
+
         <Flex gap="6">
           <Flex direction="column" width="100%">
-            {tank.nameFull && (
-              <Listing label="Full-name">{tank.nameFull}</Listing>
+            {protagonist.nameFull && (
+              <Listing label="Full-name">{protagonist.nameFull}</Listing>
             )}
             <Listing label="Nation">
               <Flex align="center" gap="1">
                 <img
                   style={{ width: '1em', height: '1em' }}
-                  alt={tank.nation}
-                  src={asset(`flags/circle/${tank.nation}.webp`)}
+                  alt={protagonist.nation}
+                  src={asset(`flags/circle/${protagonist.nation}.webp`)}
                 />
                 {
                   strings.common.nations[
-                    tank.nation as keyof typeof strings.common.nations
+                    protagonist.nation as keyof typeof strings.common.nations
                   ]
                 }
               </Flex>
@@ -39,34 +62,34 @@ export function MetaSection() {
             <Listing label="Class">
               <Flex align="center" gap="1">
                 <ClassIcon width="1em" height="1em" />
-                {strings.common.tank_class_short[tank.class]}
+                {strings.common.tank_class_short[protagonist.class]}
               </Flex>
             </Listing>
-            <Listing label="Tier">{tank.tier}</Listing>
+            <Listing label="Tier">{protagonist.tier}</Listing>
             <Listing
               label="Type"
               color={
-                tank.treeType === 'collector'
+                protagonist.treeType === 'collector'
                   ? 'blue'
-                  : tank.treeType === 'premium'
+                  : protagonist.treeType === 'premium'
                     ? 'amber'
                     : undefined
               }
             >
-              {strings.common.tree_type[tank.treeType]}
+              {strings.common.tree_type[protagonist.treeType]}
             </Listing>
           </Flex>
 
           <Flex direction="column" width="100%">
             {developerMode && (
               <Listing label="DEV: ID">
-                <Code>{tank.id}</Code>
+                <Code>{protagonist.id}</Code>
               </Listing>
             )}
-            {tank.treeType === 'premium' && (
+            {protagonist.treeType === 'premium' && (
               <Listing label="Purchase price">
                 <Flex align="center" gap="1">
-                  {tank.price.value / 400}
+                  {protagonist.price.value / 400}
                   <img
                     style={{ width: '1em', height: '1em' }}
                     alt="gold"
@@ -76,35 +99,35 @@ export function MetaSection() {
               </Listing>
             )}
             <Listing
-              label={`${tank.treeType === 'researchable' ? 'Purchase' : 'Restoration'} price`}
+              label={`${protagonist.treeType === 'researchable' ? 'Purchase' : 'Restoration'} price`}
             >
               <Flex align="center" gap="1">
-                {tank.price.value.toLocaleString()}
+                {protagonist.price.value.toLocaleString()}
                 <img
                   style={{ width: '1em', height: '1em' }}
-                  alt={tank.price.type}
+                  alt={protagonist.price.type}
                   src={asset(
-                    `icons/currencies/${tank.price.type === 'gold' ? 'gold' : 'silver'}.webp`,
+                    `icons/currencies/${protagonist.price.type === 'gold' ? 'gold' : 'silver'}.webp`,
                   )}
                 />
               </Flex>
             </Listing>
             <Listing label="Sale price">
               <Flex align="center" gap="1">
-                {(tank.price.value / 2).toLocaleString()}
+                {(protagonist.price.value / 2).toLocaleString()}
                 <img
                   style={{ width: '1em', height: '1em' }}
-                  alt={tank.price.type}
+                  alt={protagonist.price.type}
                   src={asset(
-                    `icons/currencies/${tank.price.type === 'gold' ? 'gold' : 'silver'}.webp`,
+                    `icons/currencies/${protagonist.price.type === 'gold' ? 'gold' : 'silver'}.webp`,
                   )}
                 />
               </Flex>
             </Listing>
-            {tank.xp && (
+            {protagonist.xp && (
               <Listing label="Research XP">
                 <Flex align="center" gap="1">
-                  {tank.xp.toLocaleString()}
+                  {protagonist.xp.toLocaleString()}
                   <img
                     style={{ width: '1em', height: '1em' }}
                     alt="xp"
diff --git a/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx b/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
index 40a073b4d..be3c28a3e 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
@@ -1,13 +1,11 @@
 import {
   CameraIcon,
-  ChevronLeftIcon,
   CopyIcon,
   DownloadIcon,
   EnterFullScreenIcon,
   ExitFullScreenIcon,
   EyeOpenIcon,
   GearIcon,
-  MixIcon,
 } from '@radix-ui/react-icons';
 import {
   Button,
@@ -24,7 +22,6 @@ import {
 import { invalidate } from '@react-three/fiber';
 import { RefObject, use, useEffect, useState } from 'react';
 import { ThicknessRange } from '../../../../../../../components/Armor/components/StaticArmor';
-import { Link } from '../../../../../../../components/Link';
 import { ModuleButton } from '../../../../../../../components/ModuleButtons/ModuleButton';
 import { SmallTankIcon } from '../../../../../../../components/SmallTankIcon';
 import { resolveNearPenetration } from '../../../../../../../core/blitz/resolveNearPenetration';
@@ -61,12 +58,6 @@ export function Options({ thicknessRange, canvas }: OptionsProps) {
   const [display, setDisplay] = useState<TankopediaDisplay>(
     TankopediaDisplay.Model,
   );
-  const antagonist = Duel.use((state) => state.antagonist.tank);
-  const protagonist = Duel.use((state) => state.protagonist.tank);
-  const compareTanks =
-    protagonist.id === antagonist.id
-      ? [protagonist.id]
-      : [protagonist.id, antagonist.id];
   const isFullScreen = useFullScreen();
   const showGrid = TankopediaPersistent.use(
     (state) => state.model.visual.showGrid,
@@ -346,26 +337,10 @@ export function Options({ thicknessRange, canvas }: OptionsProps) {
         direction="column"
         align="center"
         position="absolute"
-        bottom="2"
+        bottom="4"
         left="50%"
         style={{ transform: 'translateX(-50%)' }}
       >
-        <Flex gap="4">
-          <Link href="/tools/tankopedia">
-            <Button variant="ghost" size="1">
-              <ChevronLeftIcon />
-              Back
-            </Button>
-          </Link>
-
-          <Link href={`/tools/compare?tanks=${compareTanks.join('%2C')}`}>
-            <Button variant="ghost" size="1">
-              <MixIcon />
-              Compare
-            </Button>
-          </Link>
-        </Flex>
-
         {display === TankopediaDisplay.DynamicArmor && (
           <Flex align="center" gap="2">
             <Text color="gray" size="2">
diff --git a/src/core/blitzkit/var.ts b/src/core/blitzkit/var.ts
index 417008b2d..af13ad7cb 100644
--- a/src/core/blitzkit/var.ts
+++ b/src/core/blitzkit/var.ts
@@ -1,6 +1,7 @@
 type Name =
   | `color-${'background' | `panel-${'solid' | 'translucent'}` | 'surface' | 'overlay'}`
-  | `radius-${1 | 2 | 3 | 4 | 5 | 6 | 'full'}`;
+  | `radius-${1 | 2 | 3 | 4 | 5 | 6 | 'full'}`
+  | `space-${1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9}`;
 
 export function Var(name: Name) {
   return `var(--${name})`;