diff --git a/apps/rowboat/app/projects/[projectId]/simulation/app.tsx b/apps/rowboat/app/projects/[projectId]/simulation/app.tsx
index 5efe8df5..87cf9804 100644
--- a/apps/rowboat/app/projects/[projectId]/simulation/app.tsx
+++ b/apps/rowboat/app/projects/[projectId]/simulation/app.tsx
@@ -437,15 +437,15 @@ function ScenarioViewer({
         <div className="border-t border-gray-200 my-4"></div>
         
         <div className="flex flex-col">
-          <div className="text-sm font-medium text-gray-500 uppercase tracking-wider mb-4">CONTEXT</div>
-          <div className="text-base whitespace-pre-wrap">{scenario.context}</div>
+          <div className="text-sm font-medium text-gray-500 uppercase tracking-wider mb-4">DESCRIPTION</div>
+          <div className="text-base whitespace-pre-wrap">{scenario.description}</div>
         </div>
         
         <div className="border-t border-gray-200 my-4"></div>
         
         <div className="flex flex-col">
-          <div className="text-sm font-medium text-gray-500 uppercase tracking-wider mb-4">DESCRIPTION</div>
-          <div className="text-base whitespace-pre-wrap">{scenario.description}</div>
+          <div className="text-sm font-medium text-gray-500 uppercase tracking-wider mb-4">CONTEXT</div>
+          <div className="text-base whitespace-pre-wrap">{scenario.context}</div>
         </div>
       </div>
     </div>
@@ -462,16 +462,16 @@ function ScenarioEditor({
   onCancel: () => void;
 }) {
   const [name, setName] = useState(scenario.name);
-  const [context, setContext] = useState(scenario.context || '');
   const [description, setDescription] = useState(scenario.description);
+  const [context, setContext] = useState(scenario.context || '');
 
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault();
     onSave({
       ...scenario,
       name,
-      context,
       description,
+      context,
     });
   };
 
@@ -509,18 +509,6 @@ function ScenarioEditor({
 
         <div className="border-t border-gray-200 my-4"></div>
 
-        <div>
-          <div className="text-sm font-medium text-gray-500 uppercase tracking-wider mb-4">CONTEXT</div>
-          <textarea
-            value={context}
-            onChange={(e) => setContext(e.target.value)}
-            rows={4}
-            className="mt-1 block w-full rounded-md border-2 border-gray-300 shadow-sm focus:border-blue-500 focus:ring-2 focus:ring-blue-500 px-3 py-2"
-          />
-        </div>
-
-        <div className="border-t border-gray-200 my-4"></div>
-
         <div>
           <div className="text-sm font-medium text-gray-500 uppercase tracking-wider mb-4">DESCRIPTION</div>
           <textarea
@@ -530,6 +518,18 @@ function ScenarioEditor({
             className="mt-1 block w-full rounded-md border-2 border-gray-300 shadow-sm focus:border-blue-500 focus:ring-2 focus:ring-blue-500 px-3 py-2"
           />
         </div>
+
+        <div className="border-t border-gray-200 my-4"></div>
+
+        <div>
+          <div className="text-sm font-medium text-gray-500 uppercase tracking-wider mb-4">CONTEXT</div>
+          <textarea
+            value={context}
+            onChange={(e) => setContext(e.target.value)}
+            rows={4}
+            className="mt-1 block w-full rounded-md border-2 border-gray-300 shadow-sm focus:border-blue-500 focus:ring-2 focus:ring-blue-500 px-3 py-2"
+          />
+        </div>
       </form>
     </div>
   );