diff --git a/css/fvtt-ftl-nomad.css b/css/fvtt-ftl-nomad.css
index 136ff0d..9128877 100644
--- a/css/fvtt-ftl-nomad.css
+++ b/css/fvtt-ftl-nomad.css
@@ -343,24 +343,26 @@ i.fvtt-ftl-nomad {
   min-width: 5.2rem;
 }
 .fvtt-ftl-nomad .character-main .character-pc .character-right .encumbrance {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
+  display: flex;
   gap: 4px;
 }
 .fvtt-ftl-nomad .character-main .character-pc .character-right .encumbrance .form-group {
   display: flex;
   flex-direction: row;
-  align-items: center;
   margin-bottom: 4px;
 }
 .fvtt-ftl-nomad .character-main .character-pc .character-right .encumbrance label {
-  min-width: 4rem;
-  max-width: 4rem;
+  min-width: 3rem;
+  max-width: 3rem;
 }
 .fvtt-ftl-nomad .character-main .character-pc .character-right .encumbrance input {
   max-width: 3rem;
   min-width: 3rem;
 }
+.fvtt-ftl-nomad .character-main .character-pc .character-right .encumbrance .character-credit input {
+  max-width: 9rem;
+  min-width: 9rem;
+}
 .fvtt-ftl-nomad .character-main .character-pc .character-right .character-name {
   display: flex;
 }
@@ -1123,6 +1125,12 @@ i.fvtt-ftl-nomad {
 .fvtt-ftl-nomad .vehicle-description .section-editor {
   min-height: 10rem;
 }
+.fvtt-ftl-nomad .vehicle-description .section-editor .editor {
+  min-height: 10rem;
+}
+.fvtt-ftl-nomad .vehicle-description .section-editor .editor-content {
+  min-height: 10rem;
+}
 .fvtt-ftl-nomad .vehicle-description .biodata {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
@@ -1301,6 +1309,7 @@ i.fvtt-ftl-nomad {
 }
 .fvtt-ftl-nomad .robot-main .robot-pc .robot-left {
   min-width: 180px;
+  max-width: 180px;
   display: flex;
   flex-direction: column;
 }
@@ -1315,6 +1324,14 @@ i.fvtt-ftl-nomad {
   width: auto;
   border: none;
 }
+.fvtt-ftl-nomad .robot-main .robot-pc .robot-left .robot-cost label {
+  min-width: 3rem;
+  max-width: 3rem;
+}
+.fvtt-ftl-nomad .robot-main .robot-pc .robot-left .robot-cost input {
+  min-width: 6rem;
+  max-width: 6rem;
+}
 .fvtt-ftl-nomad .robot-main .robot-pc .robot-right {
   display: flex;
   flex-direction: column;
@@ -1326,7 +1343,17 @@ i.fvtt-ftl-nomad {
 .fvtt-ftl-nomad .robot-main .robot-pc .robot-right .robot-name input {
   font-family: var(--font-title);
   font-size: calc(var(--font-size-standard) * 1.4);
-  width: 400px;
+  width: 380px;
+}
+.fvtt-ftl-nomad .robot-main .robot-pc .robot-right .robot-brain {
+  min-width: 25rem;
+  max-width: 25rem;
+}
+.fvtt-ftl-nomad .robot-main .robot-pc .robot-right .robot-brain textarea {
+  min-width: 23rem;
+  max-width: 23rem;
+  background-color: rgba(0, 0, 0, 0.2);
+  color: var(--color-dark-3);
 }
 .fvtt-ftl-nomad .robot-main .robot-pc .robot-right .main-stats {
   min-width: 25rem;
@@ -1462,6 +1489,12 @@ i.fvtt-ftl-nomad {
 .fvtt-ftl-nomad .robot-description .section-editor {
   min-height: 10rem;
 }
+.fvtt-ftl-nomad .robot-description .section-editor .editor {
+  min-height: 10rem;
+}
+.fvtt-ftl-nomad .robot-description .section-editor .editor-content {
+  min-height: 10rem;
+}
 .fvtt-ftl-nomad .robot-description .biodata {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
@@ -1682,6 +1715,10 @@ i.fvtt-ftl-nomad {
   text-shadow: 0 0 8px var(--color-shadow-primary);
   cursor: pointer;
 }
+.fvtt-ftl-nomad .starship-main .starship-pc .starship-right .capacity .hull-field select {
+  min-width: 10rem;
+  max-width: 10rem;
+}
 .fvtt-ftl-nomad .starship-main .starship-pc .starship-right .capacity label {
   margin-left: 0.2rem;
   max-width: 7rem;
@@ -1774,6 +1811,12 @@ i.fvtt-ftl-nomad {
 .fvtt-ftl-nomad .starship-description .section-editor {
   min-height: 10rem;
 }
+.fvtt-ftl-nomad .starship-description .section-editor .editor {
+  min-height: 10rem;
+}
+.fvtt-ftl-nomad .starship-description .section-editor .editor-content {
+  min-height: 10rem;
+}
 .fvtt-ftl-nomad .starship-description .biodata {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
@@ -2110,6 +2153,15 @@ i.fvtt-ftl-nomad {
 .fvtt-ftl-nomad .creature-biography .rank input {
   max-width: 4rem;
 }
+.fvtt-ftl-nomad .creature-biography .section-editor {
+  min-height: 10rem;
+}
+.fvtt-ftl-nomad .creature-biography .section-editor .editor {
+  min-height: 10rem;
+}
+.fvtt-ftl-nomad .creature-biography .section-editor .editor-content {
+  min-height: 10rem;
+}
 .fvtt-ftl-nomad .creature-biography .biodata {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
diff --git a/packs/ftl-nomad-items/000088.log b/packs/ftl-nomad-items/000092.log
similarity index 100%
rename from packs/ftl-nomad-items/000088.log
rename to packs/ftl-nomad-items/000092.log
diff --git a/packs/ftl-nomad-items/CURRENT b/packs/ftl-nomad-items/CURRENT
index a43fb19..00f4669 100644
--- a/packs/ftl-nomad-items/CURRENT
+++ b/packs/ftl-nomad-items/CURRENT
@@ -1 +1 @@
-MANIFEST-000086
+MANIFEST-000091
diff --git a/packs/ftl-nomad-items/LOG b/packs/ftl-nomad-items/LOG
index 2677718..19cf0cf 100644
--- a/packs/ftl-nomad-items/LOG
+++ b/packs/ftl-nomad-items/LOG
@@ -1,14 +1,3 @@
-2025/10/15-13:50:39.028219 7f189f7fe6c0 Recovering log #84
-2025/10/15-13:50:39.038979 7f189f7fe6c0 Delete type=3 #82
-2025/10/15-13:50:39.039047 7f189f7fe6c0 Delete type=0 #84
-2025/10/15-15:26:39.732570 7f189e7fc6c0 Level-0 table #89: started
-2025/10/15-15:26:39.736109 7f189e7fc6c0 Level-0 table #89: 12073 bytes OK
-2025/10/15-15:26:39.742312 7f189e7fc6c0 Delete type=0 #87
-2025/10/15-15:26:39.748688 7f189e7fc6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at '!items!zoE4ITyfl3od6hYD' @ 721 : 1
-2025/10/15-15:26:39.748706 7f189e7fc6c0 Compacting 1@0 + 1@1 files
-2025/10/15-15:26:39.753893 7f189e7fc6c0 Generated table #90@0: 316 keys, 126470 bytes
-2025/10/15-15:26:39.753929 7f189e7fc6c0 Compacted 1@0 + 1@1 files => 126470 bytes
-2025/10/15-15:26:39.760361 7f189e7fc6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2025/10/15-15:26:39.760492 7f189e7fc6c0 Delete type=2 #73
-2025/10/15-15:26:39.760637 7f189e7fc6c0 Delete type=2 #89
-2025/10/15-15:26:39.774069 7f189e7fc6c0 Manual compaction at level-0 from '!items!zoE4ITyfl3od6hYD' @ 721 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end)
+2025/10/15-21:50:26.265715 7f189ffff6c0 Recovering log #88
+2025/10/15-21:50:26.325136 7f189ffff6c0 Delete type=3 #86
+2025/10/15-21:50:26.325207 7f189ffff6c0 Delete type=0 #88
diff --git a/packs/ftl-nomad-items/LOG.old b/packs/ftl-nomad-items/LOG.old
index 68213b6..2677718 100644
--- a/packs/ftl-nomad-items/LOG.old
+++ b/packs/ftl-nomad-items/LOG.old
@@ -1,7 +1,14 @@
-2025/10/15-10:02:54.141015 7f189f7fe6c0 Recovering log #80
-2025/10/15-10:02:54.151620 7f189f7fe6c0 Delete type=3 #78
-2025/10/15-10:02:54.151691 7f189f7fe6c0 Delete type=0 #80
-2025/10/15-10:23:16.651592 7f189e7fc6c0 Level-0 table #85: started
-2025/10/15-10:23:16.651628 7f189e7fc6c0 Level-0 table #85: 0 bytes OK
-2025/10/15-10:23:16.657926 7f189e7fc6c0 Delete type=0 #83
-2025/10/15-10:23:16.664228 7f189e7fc6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end)
+2025/10/15-13:50:39.028219 7f189f7fe6c0 Recovering log #84
+2025/10/15-13:50:39.038979 7f189f7fe6c0 Delete type=3 #82
+2025/10/15-13:50:39.039047 7f189f7fe6c0 Delete type=0 #84
+2025/10/15-15:26:39.732570 7f189e7fc6c0 Level-0 table #89: started
+2025/10/15-15:26:39.736109 7f189e7fc6c0 Level-0 table #89: 12073 bytes OK
+2025/10/15-15:26:39.742312 7f189e7fc6c0 Delete type=0 #87
+2025/10/15-15:26:39.748688 7f189e7fc6c0 Manual compaction at level-0 from '!folders!AuBtSOj1mJmh88qx' @ 72057594037927935 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at '!items!zoE4ITyfl3od6hYD' @ 721 : 1
+2025/10/15-15:26:39.748706 7f189e7fc6c0 Compacting 1@0 + 1@1 files
+2025/10/15-15:26:39.753893 7f189e7fc6c0 Generated table #90@0: 316 keys, 126470 bytes
+2025/10/15-15:26:39.753929 7f189e7fc6c0 Compacted 1@0 + 1@1 files => 126470 bytes
+2025/10/15-15:26:39.760361 7f189e7fc6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
+2025/10/15-15:26:39.760492 7f189e7fc6c0 Delete type=2 #73
+2025/10/15-15:26:39.760637 7f189e7fc6c0 Delete type=2 #89
+2025/10/15-15:26:39.774069 7f189e7fc6c0 Manual compaction at level-0 from '!items!zoE4ITyfl3od6hYD' @ 721 : 1 .. '!items!zv9dwgL3p7ThQn7j' @ 0 : 0; will stop at (end)
diff --git a/packs/ftl-nomad-items/MANIFEST-000086 b/packs/ftl-nomad-items/MANIFEST-000086
deleted file mode 100644
index 10af964..0000000
Binary files a/packs/ftl-nomad-items/MANIFEST-000086 and /dev/null differ
diff --git a/packs/ftl-nomad-items/MANIFEST-000091 b/packs/ftl-nomad-items/MANIFEST-000091
new file mode 100644
index 0000000..c218882
Binary files /dev/null and b/packs/ftl-nomad-items/MANIFEST-000091 differ
diff --git a/packs/ftl-nomad-vehicles/000066.log b/packs/ftl-nomad-vehicles/000070.log
similarity index 100%
rename from packs/ftl-nomad-vehicles/000066.log
rename to packs/ftl-nomad-vehicles/000070.log
diff --git a/packs/ftl-nomad-vehicles/CURRENT b/packs/ftl-nomad-vehicles/CURRENT
index 5d746f2..5893b8f 100644
--- a/packs/ftl-nomad-vehicles/CURRENT
+++ b/packs/ftl-nomad-vehicles/CURRENT
@@ -1 +1 @@
-MANIFEST-000064
+MANIFEST-000069
diff --git a/packs/ftl-nomad-vehicles/LOG b/packs/ftl-nomad-vehicles/LOG
index c3c20e7..d9ba081 100644
--- a/packs/ftl-nomad-vehicles/LOG
+++ b/packs/ftl-nomad-vehicles/LOG
@@ -1,14 +1,3 @@
-2025/10/15-13:50:39.042685 7f18a4ffa6c0 Recovering log #62
-2025/10/15-13:50:39.052767 7f18a4ffa6c0 Delete type=3 #60
-2025/10/15-13:50:39.052843 7f18a4ffa6c0 Delete type=0 #62
-2025/10/15-15:26:39.665250 7f189e7fc6c0 Level-0 table #67: started
-2025/10/15-15:26:39.668457 7f189e7fc6c0 Level-0 table #67: 12881 bytes OK
-2025/10/15-15:26:39.674498 7f189e7fc6c0 Delete type=0 #65
-2025/10/15-15:26:39.688322 7f189e7fc6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at '!folders!HobFutlnH6HPTEfT' @ 93 : 1
-2025/10/15-15:26:39.688334 7f189e7fc6c0 Compacting 1@0 + 1@1 files
-2025/10/15-15:26:39.692347 7f189e7fc6c0 Generated table #68@0: 78 keys, 62826 bytes
-2025/10/15-15:26:39.692380 7f189e7fc6c0 Compacted 1@0 + 1@1 files => 62826 bytes
-2025/10/15-15:26:39.698356 7f189e7fc6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2025/10/15-15:26:39.698484 7f189e7fc6c0 Delete type=2 #51
-2025/10/15-15:26:39.698645 7f189e7fc6c0 Delete type=2 #67
-2025/10/15-15:26:39.709845 7f189e7fc6c0 Manual compaction at level-0 from '!folders!HobFutlnH6HPTEfT' @ 93 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end)
+2025/10/15-21:50:26.444225 7f18a4ffa6c0 Recovering log #66
+2025/10/15-21:50:26.495317 7f18a4ffa6c0 Delete type=3 #64
+2025/10/15-21:50:26.495386 7f18a4ffa6c0 Delete type=0 #66
diff --git a/packs/ftl-nomad-vehicles/LOG.old b/packs/ftl-nomad-vehicles/LOG.old
index cc4a18f..c3c20e7 100644
--- a/packs/ftl-nomad-vehicles/LOG.old
+++ b/packs/ftl-nomad-vehicles/LOG.old
@@ -1,7 +1,14 @@
-2025/10/15-10:02:54.154455 7f18a4ffa6c0 Recovering log #58
-2025/10/15-10:02:54.164920 7f18a4ffa6c0 Delete type=3 #56
-2025/10/15-10:02:54.164970 7f18a4ffa6c0 Delete type=0 #58
-2025/10/15-10:23:16.644379 7f189e7fc6c0 Level-0 table #63: started
-2025/10/15-10:23:16.644413 7f189e7fc6c0 Level-0 table #63: 0 bytes OK
-2025/10/15-10:23:16.651461 7f189e7fc6c0 Delete type=0 #61
-2025/10/15-10:23:16.664216 7f189e7fc6c0 Manual compaction at level-0 from '!actors!3pydTJsM73Z4o0V6' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end)
+2025/10/15-13:50:39.042685 7f18a4ffa6c0 Recovering log #62
+2025/10/15-13:50:39.052767 7f18a4ffa6c0 Delete type=3 #60
+2025/10/15-13:50:39.052843 7f18a4ffa6c0 Delete type=0 #62
+2025/10/15-15:26:39.665250 7f189e7fc6c0 Level-0 table #67: started
+2025/10/15-15:26:39.668457 7f189e7fc6c0 Level-0 table #67: 12881 bytes OK
+2025/10/15-15:26:39.674498 7f189e7fc6c0 Delete type=0 #65
+2025/10/15-15:26:39.688322 7f189e7fc6c0 Manual compaction at level-0 from '!actors!0FQ6XaRi24OorI21' @ 72057594037927935 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at '!folders!HobFutlnH6HPTEfT' @ 93 : 1
+2025/10/15-15:26:39.688334 7f189e7fc6c0 Compacting 1@0 + 1@1 files
+2025/10/15-15:26:39.692347 7f189e7fc6c0 Generated table #68@0: 78 keys, 62826 bytes
+2025/10/15-15:26:39.692380 7f189e7fc6c0 Compacted 1@0 + 1@1 files => 62826 bytes
+2025/10/15-15:26:39.698356 7f189e7fc6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
+2025/10/15-15:26:39.698484 7f189e7fc6c0 Delete type=2 #51
+2025/10/15-15:26:39.698645 7f189e7fc6c0 Delete type=2 #67
+2025/10/15-15:26:39.709845 7f189e7fc6c0 Manual compaction at level-0 from '!folders!HobFutlnH6HPTEfT' @ 93 : 1 .. '!folders!vRnrOJqSMlxbSgyX' @ 0 : 0; will stop at (end)
diff --git a/packs/ftl-nomad-vehicles/MANIFEST-000064 b/packs/ftl-nomad-vehicles/MANIFEST-000064
deleted file mode 100644
index 6733555..0000000
Binary files a/packs/ftl-nomad-vehicles/MANIFEST-000064 and /dev/null differ
diff --git a/packs/ftl-nomad-vehicles/MANIFEST-000069 b/packs/ftl-nomad-vehicles/MANIFEST-000069
new file mode 100644
index 0000000..c275d64
Binary files /dev/null and b/packs/ftl-nomad-vehicles/MANIFEST-000069 differ
diff --git a/styles/character.less b/styles/character.less
index 2758b0c..d16c973 100644
--- a/styles/character.less
+++ b/styles/character.less
@@ -123,23 +123,27 @@
       }
 
       .encumbrance {
-        display: grid;
-        grid-template-columns: repeat(3, 1fr);
+        display: flex;
         gap: 4px;
         .form-group {
           display: flex;
           flex-direction: row;
-          align-items: center;
           margin-bottom: 4px;
         }
         label {
-          min-width: 4rem;
-          max-width: 4rem;
+          min-width: 3rem;
+          max-width: 3rem;
         }
         input {
           max-width: 3rem;
           min-width: 3rem;
         }
+        .character-credit {
+          input {
+            max-width: 9rem;
+            min-width: 9rem;
+          }
+        }
       }
 
       .character-name {
diff --git a/styles/creature.less b/styles/creature.less
index db94181..c096848 100644
--- a/styles/creature.less
+++ b/styles/creature.less
@@ -201,6 +201,16 @@
     }
   }
 
+  .section-editor {
+    min-height: 10rem;
+    .editor {
+      min-height: 10rem;
+    }
+    .editor-content {
+      min-height: 10rem;
+    }
+  }
+
   .biodata {
     display: grid;
     grid-template-columns: repeat(2, 1fr);
diff --git a/styles/robot.less b/styles/robot.less
index 538da21..254559f 100644
--- a/styles/robot.less
+++ b/styles/robot.less
@@ -19,6 +19,7 @@
 
     .robot-left {
       min-width: 180px;
+      max-width: 180px;
       display: flex;
       flex-direction: column;
 
@@ -33,6 +34,17 @@
           border: none;
         }
       }
+
+      .robot-cost {
+        label {
+          min-width: 3rem;
+          max-width: 3rem;
+        }
+        input {
+          min-width: 6rem;
+          max-width: 6rem;
+        }
+      }
     }
 
     .robot-right {
@@ -45,7 +57,18 @@
         input {
           font-family: var(--font-title);
           font-size: calc(var(--font-size-standard) * 1.4);
-          width: 400px;
+          width: 380px;
+        }
+      }
+
+      .robot-brain {
+        min-width: 25rem;
+        max-width: 25rem;
+        textarea {
+          min-width: 23rem;
+          max-width: 23rem;
+          background-color: rgba(0, 0, 0, 0.2);
+          color: var(--color-dark-3);
         }
       }
 
@@ -198,6 +221,12 @@
   }
   .section-editor {
     min-height: 10rem;
+    .editor {
+      min-height: 10rem;
+    }
+    .editor-content {
+      min-height: 10rem;
+    }
   }
 
   .biodata {
diff --git a/styles/starship.less b/styles/starship.less
index 68b949b..e607ef0 100644
--- a/styles/starship.less
+++ b/styles/starship.less
@@ -68,6 +68,12 @@
           text-shadow: 0 0 8px var(--color-shadow-primary);
           cursor: pointer;
         }
+        .hull-field {
+          select {
+            min-width: 10rem;
+            max-width: 10rem;
+          }
+        }
         label {
           margin-left: 0.2rem;
           max-width: 7rem;
@@ -173,6 +179,12 @@
 
   .section-editor {
     min-height: 10rem;
+    .editor {
+      min-height: 10rem;
+    }
+    .editor-content {
+      min-height: 10rem;
+    }
   }
 
   .biodata {
diff --git a/styles/vehicle.less b/styles/vehicle.less
index a5e7ffb..797ff7d 100644
--- a/styles/vehicle.less
+++ b/styles/vehicle.less
@@ -33,7 +33,6 @@
           border: none;
         }
       }
-
     }
 
     .vehicle-right {
@@ -136,8 +135,15 @@
   .field-label {
     margin-left: 8px;
   }
- .section-editor {
+
+  .section-editor {
     min-height: 10rem;
+    .editor {
+      min-height: 10rem;
+    }
+    .editor-content {
+      min-height: 10rem;
+    }
   }
 
   .biodata {
@@ -145,17 +151,16 @@
     grid-template-columns: repeat(2, 1fr);
     gap: 8px;
     label {
-      min-width: 3.0rem;
+      min-width: 3rem;
     }
     .feature {
-        display: flex;
-        align-items: center;
-        gap: 4px;
-        min-width: 18rem;
-        max-width: 18rem;
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      min-width: 18rem;
+      max-width: 18rem;
     }
   }
-
 }
 
 .tab.vehicle-equipment .main-div {
diff --git a/templates/character-main.hbs b/templates/character-main.hbs
index 9c8f150..53c2c20 100644
--- a/templates/character-main.hbs
+++ b/templates/character-main.hbs
@@ -113,7 +113,14 @@
             rootId=partId
             disabled=isPlayMode
           }}
-          {{formField systemFields.credits value=system.credits rootId=partId}}
+          <span class="character-credit">
+            {{formField
+              systemFields.credits
+              value=system.credits
+              rootId=partId
+              disabled=isPlayMode
+            }}
+          </span>
         </fieldset>
 
       </div>
diff --git a/templates/creature-biography.hbs b/templates/creature-biography.hbs
index 5bba6e3..9a8c258 100644
--- a/templates/creature-biography.hbs
+++ b/templates/creature-biography.hbs
@@ -1,18 +1,33 @@
-<section class="tab creature-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
+<section
+  class="tab creature-{{tab.id}} {{tab.cssClass}}"
+  data-tab="{{tab.id}}"
+  data-group="{{tab.group}}"
+>
 
-<div class="main-div">
+  <div class="main-div">
 
-  <fieldset>
-    <legend>{{localize "FTLNOMAD.Label.description"}}</legend>
-    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description"
-    toggled=true}}
-  </fieldset>
+    <fieldset class="section-editor">
+      <legend>{{localize "FTLNOMAD.Label.description"}}</legend>
+      {{formInput
+        systemFields.description
+        enriched=enrichedDescription
+        value=system.description
+        name="system.description"
+        toggled=true
+      }}
+    </fieldset>
 
-  <fieldset>
-    <legend>{{localize "FTLNOMAD.Label.notes"}}</legend>
-    {{formInput systemFields.notes enriched=enrichedNotes value=system.notes name="system.notes" toggled=true}}
-  </fieldset>
+    <fieldset class="section-editor">
+      <legend>{{localize "FTLNOMAD.Label.notes"}}</legend>
+      {{formInput
+        systemFields.notes
+        enriched=enrichedNotes
+        value=system.notes
+        name="system.notes"
+        toggled=true
+      }}
+    </fieldset>
 
-</div>
+  </div>
 
 </section>
\ No newline at end of file
diff --git a/templates/robot-description.hbs b/templates/robot-description.hbs
index a8f0b70..6579db5 100644
--- a/templates/robot-description.hbs
+++ b/templates/robot-description.hbs
@@ -6,7 +6,12 @@
   <fieldset>
     <legend>Tech Age</legend>
     <div class="flexrow">
-      {{formField systemFields.techAge value=system.techAge localize=true}}
+      {{formField
+        systemFields.techAge
+        value=system.techAge
+        localize=true
+        disabled=isPlayMode
+      }}
     </div>
   </fieldset>
 
diff --git a/templates/robot-main.hbs b/templates/robot-main.hbs
index 96b272a..dcb56d8 100644
--- a/templates/robot-main.hbs
+++ b/templates/robot-main.hbs
@@ -3,6 +3,7 @@
   <fieldset>
     <legend>{{localize "FTLNOMAD.Label.robot"}}</legend>
     <div class="robot-pc robot-pc-{{ifThen isPlayMode 'play' 'edit'}}">
+
       <div class="robot-left">
         <div class="robot-left-image">
           <img
@@ -13,7 +14,19 @@
             data-tooltip="{{actor.name}}"
           />
         </div>
-
+        <div>
+          <fieldset class="robot-cost">
+            <legend>Cost</legend>
+            <div class="flexrow">
+              {{formField
+                systemFields.cost
+                value=system.cost
+                localize=true
+                disabled=isPlayMode
+              }}
+            </div>
+          </fieldset>
+        </div>
       </div>
 
       <div class="robot-right">
@@ -66,22 +79,18 @@
               disabled=isPlayMode
             }}
           </div>
+        </fieldset>
+
+        <fieldset class="robot-brain">
+          <legend>Brain</legend>
           <div class="flexrow">
-            {{formField
-              systemFields.cost
-              value=system.cost
-              localize=true
-              disabled=isPlayMode
-            }}
-          </div>
-          <div class="flexrow">
-            {{formField
-              systemFields.brain
-              value=system.brain
-              localize=true
-              classes="robot-brain"
-              disabled=isPlayMode
-            }}
+            <textarea
+              cols="64"
+              rows="5"
+              name="system.brain"
+              data-tooltip="{{localize 'FTLNOMAD.Tooltip.brain'}}"
+              disabled="isPlayMode"
+            >{{system.brain}}</textarea>
           </div>
         </fieldset>
 
diff --git a/templates/starship-main.hbs b/templates/starship-main.hbs
index b390b6e..3ea64d8 100644
--- a/templates/starship-main.hbs
+++ b/templates/starship-main.hbs
@@ -58,20 +58,13 @@
 
         <fieldset class="capacity">
           <legend>{{localize "FTLNOMAD.Label.capacity"}}</legend>
-          <div class="flexrow">
+          <div class="flexrow hull-field">
             {{formField
               systemFields.hullType
               value=system.hullType
               localize=true
               disabled=isPlayMode
             }}
-            {{formField
-              systemFields.travelMultiplier
-              value=system.travelMultiplier
-              localize=true
-              disabled=isPlayMode
-            }}
-
           </div>
 
           <div class="flexrow-guns">
@@ -87,6 +80,14 @@
               localize=true
               disabled=isPlayMode
             }}
+
+            {{formField
+              systemFields.travelMultiplier
+              value=system.travelMultiplier
+              localize=true
+              disabled=isPlayMode
+            }}
+
           </div>
 
         </fieldset>
diff --git a/templates/vehicle-description.hbs b/templates/vehicle-description.hbs
index 26468ab..53ea760 100644
--- a/templates/vehicle-description.hbs
+++ b/templates/vehicle-description.hbs
@@ -6,7 +6,12 @@
   <fieldset>
     <legend>{{localize "FTLNOMAD.Label.techAge"}}</legend>
     <div class="flexrow">
-      {{formField systemFields.techAge value=system.techAge localize=true}}
+      {{formField
+        systemFields.techAge
+        value=system.techAge
+        localize=true
+        disabled=isPlayMode
+      }}
       &nbsp;
       {{formField
         systemFields.cost