diff --git a/src/components/controls/controls.tsx b/src/components/controls/controls.tsx
index 09c96f207..fae468a6f 100644
--- a/src/components/controls/controls.tsx
+++ b/src/components/controls/controls.tsx
@@ -22,7 +22,7 @@ import ToggleTangle from "./toggle-tangle";
 import Language from "./language";
 import { ControlsContainer } from "./styles";
 import FilterData, {FilterInfo} from "./filter";
-import {TreeInfo, MapInfo, AnimationOptionsInfo, PanelOptionsInfo,
+import {TreeInfo, MapInfo, AnimationOptionsInfo, PanelLayoutInfo,
   ExplodeTreeInfo, EntropyInfo, FrequencyInfo, MeasurementsInfo} from "./miscInfoText";
 import { ControlHeader } from "./controlHeader";
 import MeasurementsOptions from "./measurementsOptions";
@@ -50,7 +50,15 @@ function Controls() {
       <ControlHeader title={t("sidebar:Filter Data")} tooltip={FilterInfo}/>
       <FilterData measurementsOn={panelsToDisplay.includes("measurements")} />
 
-      <span style={{ paddingTop: "10px" }} />
+      {canTogglePanelLayout ?
+        <>
+          <ControlHeader title={t("sidebar:Display")} tooltip={PanelLayoutInfo} />
+          <PanelLayout />
+        </>
+        :
+        <span style={{ paddingTop: "10px" }} />
+      }
+
 
       {panelsAvailable.includes("tree") &&
         <PanelSection
@@ -115,14 +123,6 @@ function Controls() {
         <AnimationOptions />
       </span>
 
-      {canTogglePanelLayout &&
-        <>
-          <span style={{ paddingTop: "10px" }} />
-          <ControlHeader title={t("sidebar:Panel Options")} tooltip={PanelOptionsInfo} />
-          <PanelLayout />
-        </>
-      }
-
       <span style={{ paddingTop: "10px" }} />
       <ControlHeader title={t("sidebar:Language")}/>
       <Language />
diff --git a/src/components/controls/miscInfoText.js b/src/components/controls/miscInfoText.js
index 92a61e591..dbf542db4 100644
--- a/src/components/controls/miscInfoText.js
+++ b/src/components/controls/miscInfoText.js
@@ -28,7 +28,7 @@ export const AnimationOptionsInfo = (
   </>
 );
 
-export const PanelOptionsInfo = (
+export const PanelLayoutInfo = (
   <>
     Control whether to show the tree and the map side-by-side (<em>grid</em>) or expanded (<em>full</em>).
   </>
diff --git a/src/locales/ar/sidebar.json b/src/locales/ar/sidebar.json
index 259b74ef3..782f620c9 100644
--- a/src/locales/ar/sidebar.json
+++ b/src/locales/ar/sidebar.json
@@ -18,7 +18,6 @@
   "Animation Speed": "سرعة الحركة",
   "Loop animation": "حركة متكررة",
   "Animate cumulative history": "تحريك التاريخ التراكمي",
-  "Panel Options": "خيارات اللوحة",
   "Tree": "الشجرة",
   "Map": "الخريطة",
   "Entropy": "الانتروبيا",
diff --git a/src/locales/de/sidebar.json b/src/locales/de/sidebar.json
index 4c7775d46..4263998f7 100644
--- a/src/locales/de/sidebar.json
+++ b/src/locales/de/sidebar.json
@@ -17,7 +17,6 @@
   "Animation Speed": "Geschwindigkeit der Animation",
   "Loop animation": "In einer Schleife animieren",
   "Animate cumulative history": "Gesamten Verlauf miteinbeziehen",
-  "Panel Options": "Hauptansicht-Einstellungen",
   "Tree": "Baum",
   "Map": "Karte",
   "Entropy": "Entropie",
diff --git a/src/locales/en/sidebar.json b/src/locales/en/sidebar.json
index fe78fd56a..e4fe807f3 100644
--- a/src/locales/en/sidebar.json
+++ b/src/locales/en/sidebar.json
@@ -18,7 +18,7 @@
   "Animation Speed": "Animation Speed",
   "Loop animation": "Loop animation",
   "Animate cumulative history": "Animate cumulative history",
-  "Panel Options": "Panel Options",
+  "Display": "Display",
   "Tree": "Tree",
   "Map": "Map",
   "Entropy": "Entropy",
diff --git a/src/locales/es/sidebar.json b/src/locales/es/sidebar.json
index 4f749afaa..20374258f 100644
--- a/src/locales/es/sidebar.json
+++ b/src/locales/es/sidebar.json
@@ -17,7 +17,6 @@
   "Animation Speed": "Velocidad de la animación",
   "Loop animation": "Repitir la animación",
   "Animate cumulative history": "Animar historial cumulativo",
-  "Panel Options": "Opciones del panel",
   "Tree": "Árbol",
   "Map": "Mapa",
   "Entropy": "Entropía",
diff --git a/src/locales/fr/sidebar.json b/src/locales/fr/sidebar.json
index 48b255b4a..fbcaada9f 100644
--- a/src/locales/fr/sidebar.json
+++ b/src/locales/fr/sidebar.json
@@ -18,7 +18,6 @@
   "Animation Speed": "Vitesse d'animation",
   "Loop animation": "Animation en boucle",
   "Animate cumulative history": "Animer l'historique cumulatif",
-  "Panel Options": "Options du panneau",
   "Tree": "Arbre",
   "Map": "Carte",
   "Entropy": "Entropie",
diff --git a/src/locales/it/sidebar.json b/src/locales/it/sidebar.json
index fad3fbb5f..a47f6927c 100644
--- a/src/locales/it/sidebar.json
+++ b/src/locales/it/sidebar.json
@@ -18,7 +18,6 @@
   "Animation Speed": "Velocità di animazioni",
   "Loop animation": "Animazioni in loop",
   "Animate cumulative history": "Animare la storia cumulativa",
-  "Panel Options": "Opzioni di pannello",
   "Tree": "Albero",
   "Map": "Mappa",
   "Entropy": "Entropia",
diff --git a/src/locales/ja/sidebar.json b/src/locales/ja/sidebar.json
index 9fe5e1293..e8971760d 100644
--- a/src/locales/ja/sidebar.json
+++ b/src/locales/ja/sidebar.json
@@ -18,7 +18,6 @@
   "Animation Speed": "アニメーション速度",
   "Loop animation": "アニメーションを繰り返し",
   "Animate cumulative history": "累積の履歴をアニメーション",
-  "Panel Options": "パネルのオプション",
   "Tree": "ツリー",
   "Map": "地図",
   "Entropy": "エントロピー",
diff --git a/src/locales/lt/sidebar.json b/src/locales/lt/sidebar.json
index 0f3c9d3be..a121e919f 100644
--- a/src/locales/lt/sidebar.json
+++ b/src/locales/lt/sidebar.json
@@ -18,7 +18,6 @@
   "Animation Speed": "Animacijos greitis",
   "Loop animation": "Kartoti laiko atkarpą",
   "Animate cumulative history": "Rodyti kauptinę istoriją",
-  "Panel Options": "Langų parinktys",
   "Tree": "Medį",
   "Map": "Žemėlapį",
   "Entropy": "Entropiją",
diff --git a/src/locales/pl/sidebar.json b/src/locales/pl/sidebar.json
index 490b8a8d7..340c2428d 100644
--- a/src/locales/pl/sidebar.json
+++ b/src/locales/pl/sidebar.json
@@ -21,7 +21,6 @@
   "Animation Speed": "Szybkość animacji",
   "Loop animation": "Animacja pętli",
   "Animate cumulative history": "Animuj historię zbiorczą",
-  "Panel Options": "Opcje panelu",
   "Tree": "Drzewo",
   "Map": "Mapę",
   "Entropy": "Entropię",
diff --git a/src/locales/pt/sidebar.json b/src/locales/pt/sidebar.json
index 85a7bd91a..3c0348468 100644
--- a/src/locales/pt/sidebar.json
+++ b/src/locales/pt/sidebar.json
@@ -18,7 +18,6 @@
   "Animation Speed": "Velocidade de Animação",
   "Loop animation": "Repetir a animação",
   "Animate cumulative history": "Animar o histórico acumulado",
-  "Panel Options": "Painel de Opções",
   "Tree": "Árvore",
   "Map": "Mapa",
   "Entropy": "Entropia",
diff --git a/src/locales/ru/sidebar.json b/src/locales/ru/sidebar.json
index 7d83d068f..ed95dec2d 100644
--- a/src/locales/ru/sidebar.json
+++ b/src/locales/ru/sidebar.json
@@ -17,7 +17,6 @@
   "Animation Speed": "Скорость Анимации",
   "Loop animation": "Повтор анимации",
   "Animate cumulative history": "Анимировать кумулятивную историю",
-  "Panel Options": "Настройки Панели",
   "Tree": "Дерево",
   "Map": "Карту",
   "Entropy": "Энтропию",
diff --git a/src/locales/tr/sidebar.json b/src/locales/tr/sidebar.json
index b2e30f9f6..f45c9ecd7 100644
--- a/src/locales/tr/sidebar.json
+++ b/src/locales/tr/sidebar.json
@@ -18,7 +18,6 @@
   "Animation Speed": "Animasyon Hızı",
   "Loop animation": "Döngülü animasyon",
   "Animate cumulative history": "Kümülatif tarihçeyi canlandır",
-  "Panel Options": "Panel Seçenekleri",
   "Tree": "Ağacı",
   "Map": "Haritayı",
   "Entropy": "Entropiyi",