diff --git a/src/app/tools/tankopedia/[id]/components/Lighting.tsx b/src/app/tools/tankopedia/[id]/components/Lighting.tsx
index f6916a9f5..1cf7f6393 100644
--- a/src/app/tools/tankopedia/[id]/components/Lighting.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Lighting.tsx
@@ -9,7 +9,6 @@ export const ENVIRONMENTS = [
   'warehouse',
   'dawn',
   'sunset',
-  'night',
 ] as const;
 
 export function Lighting() {
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 527f92a3f..2ea2ac0e1 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
@@ -72,17 +72,6 @@ export function Options({ isFullScreen, canvas }: OptionsProps) {
         </DropdownMenu.Trigger>
 
         <DropdownMenu.Content>
-          <DropdownMenu.CheckboxItem
-            checked={showGrid}
-            onCheckedChange={(checked) => {
-              mutateTankopediaPersistent((draft) => {
-                draft.model.visual.showGrid = checked;
-              });
-            }}
-          >
-            Show grid
-          </DropdownMenu.CheckboxItem>
-
           <DropdownMenu.CheckboxItem
             checked={greenPenetration}
             onCheckedChange={(checked) => {
@@ -94,6 +83,17 @@ export function Options({ isFullScreen, canvas }: OptionsProps) {
             Green penetration
           </DropdownMenu.CheckboxItem>
 
+          <DropdownMenu.CheckboxItem
+            checked={showGrid}
+            onCheckedChange={(checked) => {
+              mutateTankopediaPersistent((draft) => {
+                draft.model.visual.showGrid = checked;
+              });
+            }}
+          >
+            Show grid
+          </DropdownMenu.CheckboxItem>
+
           <DropdownMenu.CheckboxItem
             checked={showEnvironment}
             onCheckedChange={(checked) => {
@@ -109,7 +109,6 @@ export function Options({ isFullScreen, canvas }: OptionsProps) {
             <DropdownMenu.SubTrigger>Lighting</DropdownMenu.SubTrigger>
 
             <DropdownMenu.SubContent>
-              <DropdownMenu.Label>Preset</DropdownMenu.Label>
               <DropdownMenu.RadioGroup value={environment}>
                 {ENVIRONMENTS.map((environment) => (
                   <DropdownMenu.RadioItem