diff --git a/frontend/react/src/ui/modals/trainingmodal.tsx b/frontend/react/src/ui/modals/trainingmodal.tsx
index ef55de5f..2cfe79c1 100644
--- a/frontend/react/src/ui/modals/trainingmodal.tsx
+++ b/frontend/react/src/ui/modals/trainingmodal.tsx
@@ -19,7 +19,7 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 0 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <img
               src="images/olympus-500x500.png"
               className={`my-auto h-40 w-40 rounded-xl`}
@@ -74,7 +74,7 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 1 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <img
               src="images/training/step1.gif"
               className={`h-72 w-72 rounded-xl`}
@@ -93,7 +93,7 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 2 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <img
               src="images/training/step2.gif"
               className={`h-72 w-72 rounded-xl`}
@@ -116,7 +116,7 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 3 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <img
               src="images/training/step3.gif"
               className={`h-72 w-72 rounded-xl`}
@@ -135,7 +135,7 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 4 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <img
               src="images/training/step4.gif"
               className={`h-72 w-72 rounded-xl`}
@@ -154,7 +154,7 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 5 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <img
               src="images/training/step5.gif"
               className={`h-72 w-72 rounded-xl`}
@@ -177,7 +177,7 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 6 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <img
               src="images/training/step6.gif"
               className={`h-72 w-72 rounded-xl`}
@@ -196,7 +196,7 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 7 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <img
               src="images/training/step7.gif"
               className={`h-72 w-72 rounded-xl`}
@@ -218,7 +218,7 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 8 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <img
               src="images/training/step8.gif"
               className={`h-72 w-72 rounded-xl`}
@@ -238,7 +238,7 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 9 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <img
               src="images/training/unitmarker.png"
               className={`max-h-34 max-w-34 my-auto rounded-xl`}
@@ -353,11 +353,11 @@ export function TrainingModal(props: { open: boolean }) {
 
       <>
         {step === 10 && (
-          <div className="flex gap-16">
+          <div className="flex flex-col sm:flex-row gap-4 sm:gap-16">
             <div className="flex flex-col gap-4 text-gray-400">
               <h2 className={`text-xl font-semibold text-white`}>The unit marker (2 of 2)</h2>
               <p>The unit marker has a symbol showing the unit state, i.e. what instruction it is performing. These are all the possible values:</p>
-              <div className="flex max-h-40 flex-col flex-wrap gap-4">
+              <div className="flex sm:max-h-64 flex-col flex-wrap gap-4">
                 <div className="flex flex-col">
                   <p className="flex gap-2">
                     <img src="images/states/attack.svg" />
@@ -475,7 +475,7 @@ export function TrainingModal(props: { open: boolean }) {
         )}
 
         {step > 0 && (
-          <div className="my-auto flex gap-2">
+          <div className="my-auto gap-2 hidden sm:flex">
             {[...Array(MAX_STEPS).keys()].map((i) => (
               <div
                 key={i + 1}
diff --git a/frontend/react/src/ui/panels/components/menu.tsx b/frontend/react/src/ui/panels/components/menu.tsx
index 3b7a8fb1..7da2ed98 100644
--- a/frontend/react/src/ui/panels/components/menu.tsx
+++ b/frontend/react/src/ui/panels/components/menu.tsx
@@ -10,15 +10,19 @@ export function Menu(props: {
   onBack?: () => void;
   showBackButton?: boolean;
   children?: JSX.Element | JSX.Element[];
+  autohide?: boolean;
   wiki?: () => JSX.Element | JSX.Element[];
 }) {
   const [hide, setHide] = useState(true);
   const [wiki, setWiki] = useState(false);
 
-  if (!props.open && hide) setHide(false);
-
   useEffect(() => {
-    if (window.innerWidth > 640) setHide(false);
+    if (props.autohide) {
+      if (window.innerWidth > 640) setHide(false);
+      if (!props.open) setHide(true);
+    } else {
+      setHide(false);
+    }
   }, [props.open]);
 
   return (
@@ -108,12 +112,16 @@ export function Menu(props: {
             `}
           />
         </h5>
-        <div className="flex h-[calc(100%-3rem)] w-full">
+        <div className="flex flex-col h-[calc(100%-3rem)] w-full sm:flex-row">
           <div
             data-wiki={wiki}
             className={`
               w-0 overflow-hidden transition-all
-              data-[wiki='true']:w-[50%]
+              h-0
+              data-[wiki='true']:min-h-[50%]
+              data-[wiki='true']:min-w-full
+              sm:data-[wiki='true']:min-w-[50%]
+              sm:data-[wiki='true']:min-h-full
             `}
           >
             {props.wiki ? props.wiki() : <div className={`p-4 text-gray-200`}>Work in progress</div>}
@@ -121,7 +129,6 @@ export function Menu(props: {
           <div
             data-wiki={wiki}
             className={`
-              min-w-full
               sm:w-[400px]
             `}
           >
diff --git a/frontend/react/src/ui/panels/unitcontrolmenu.tsx b/frontend/react/src/ui/panels/unitcontrolmenu.tsx
index 6e662acb..0ee452ea 100644
--- a/frontend/react/src/ui/panels/unitcontrolmenu.tsx
+++ b/frontend/react/src/ui/panels/unitcontrolmenu.tsx
@@ -295,6 +295,7 @@ export function UnitControlMenu(props: { open: boolean; onClose: () => void }) {
       open={props.open}
       title={selectedUnits.length > 0 ? `Units selected (x${selectedUnits.length})` : `No units selected`}
       onClose={props.onClose}
+      autohide={true}
       wiki={() => {
         return (
           <div