diff --git a/static/js/index.js b/static/js/index.js
index ff7cf5b..96b98ef 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -205,10 +205,10 @@ window.app = Vue.createApp({
       },
       cassettesTable: {
         columns: [
+          {name: 'position', label: 'Bay', field: 'position', align: 'right'},
           {name: 'denomination', label: 'Denomination', field: 'denomination', align: 'right'},
           {name: 'count', label: 'Count', field: 'count', align: 'right'},
-          {name: 'position', label: 'Position', field: 'position', align: 'right'},
-          {name: 'state_count', label: 'ATM-reported', field: 'state_count', align: 'right'},
+          {name: 'state', label: 'ATM-reported', field: 'state_denomination', align: 'right'},
           {name: 'updated_at', label: 'Updated', field: 'updated_at', align: 'left'}
         ],
         pagination: {rowsPerPage: 0} // hide pagination — cassette count is small
@@ -816,15 +816,16 @@ window.app = Vue.createApp({
     },
 
     markCassetteDirty(row) {
-      // Find pristine match by denomination and compare; flip _dirty +
-      // overall dirty flag accordingly.
+      // Find pristine match by position (the row identity) and compare;
+      // flip _dirty + overall dirty flag accordingly. Editable fields
+      // are denomination + count; position is the immutable row key.
       const pristine = this.machineDetail.cassettesPristine.find(
-        p => p.denomination === row.denomination
+        p => p.position === row.position
       )
       row._dirty =
         !pristine ||
-        Number(row.count) !== Number(pristine.count) ||
-        Number(row.position) !== Number(pristine.position)
+        Number(row.denomination) !== Number(pristine.denomination) ||
+        Number(row.count) !== Number(pristine.count)
       this.machineDetail.cassettesDirty =
         this.machineDetail.cassetteEdits.some(r => r._dirty)
     },
@@ -844,18 +845,18 @@ window.app = Vue.createApp({
     },
 
     async submitCassettePublish() {
-      // Build the PublishCassettesPayload shape:
-      //   { denominations: { "<denom>": { position, count }, ... } }
-      // The API enforces the denomination set matches what's stored —
+      // Build the PublishCassettesPayload shape (v1.1, position-keyed):
+      //   { positions: { "<pos>": { denomination, count }, ... } }
+      // The API enforces the position set matches what's stored —
       // since we only edit existing rows, this should always pass.
-      const denominations = {}
+      const positions = {}
       for (const row of this.machineDetail.cassetteEdits) {
-        denominations[String(row.denomination)] = {
-          position: Number(row.position),
+        positions[String(row.position)] = {
+          denomination: Number(row.denomination),
           count: Number(row.count)
         }
       }
-      const payload = {denominations}
+      const payload = {positions}
       this.machineDetail.cassettesPublishing = true
       try {
         const {data} = await LNbits.api.request(
diff --git a/templates/satmachineadmin/index.html b/templates/satmachineadmin/index.html
index f0ebc48..8b3ddf3 100644
--- a/templates/satmachineadmin/index.html
+++ b/templates/satmachineadmin/index.html
@@ -1023,7 +1023,7 @@
           <q-table v-if="machineDetail.cassetteEdits.length"
             dense flat
             :rows="machineDetail.cassetteEdits"
-            row-key="denomination"
+            row-key="position"
             :columns="cassettesTable.columns"
             :pagination="cassettesTable.pagination"
             hide-pagination>
@@ -1032,10 +1032,15 @@
                     :style="props.row._dirty
                             ? {boxShadow: 'inset 4px 0 0 0 #fdd835'}
                             : {}">
+                <q-td key="position" class="text-right">
+                  <b v-text="'Bay ' + props.row.position"></b>
+                </q-td>
                 <q-td key="denomination" class="text-right">
-                  <b v-text="props.row.denomination"></b>
-                  <span :style="{fontSize: '0.85em', opacity: 0.6}"
-                        v-text="' ' + (machineDetail.machine.fiat_code || '')"></span>
+                  <q-input v-model.number="props.row.denomination"
+                           type="number" min="1" step="1" dense outlined
+                           :suffix="machineDetail.machine.fiat_code || ''"
+                           :style="{width: '140px', display: 'inline-block'}"
+                           @update:model-value="markCassetteDirty(props.row)"></q-input>
                 </q-td>
                 <q-td key="count" class="text-right">
                   <q-input v-model.number="props.row.count" type="number"
@@ -1043,16 +1048,15 @@
                            :style="{width: '120px', display: 'inline-block'}"
                            @update:model-value="markCassetteDirty(props.row)"></q-input>
                 </q-td>
-                <q-td key="position" class="text-right">
-                  <q-input v-model.number="props.row.position" type="number"
-                           min="1" step="1" dense outlined
-                           :style="{width: '80px', display: 'inline-block'}"
-                           @update:model-value="markCassetteDirty(props.row)"></q-input>
-                </q-td>
-                <q-td key="state_count" class="text-right">
-                  <span v-if="props.row.state_count !== null"
-                        :style="{fontSize: '0.85em', opacity: 0.7}"
-                        v-text="props.row.state_count"></span>
+                <q-td key="state" class="text-right">
+                  <span v-if="props.row.state_denomination !== null"
+                        :style="{fontSize: '0.85em', opacity: 0.7}">
+                    <span v-text="props.row.state_denomination"></span>
+                    <span :style="{opacity: 0.6}"
+                          v-text="' ' + (machineDetail.machine.fiat_code || '')"></span>
+                    <span :style="{opacity: 0.6}"> · </span>
+                    <span v-text="'×' + props.row.state_count"></span>
+                  </span>
                   <span v-else :style="{opacity: 0.4}">—</span>
                 </q-td>
                 <q-td key="updated_at">
@@ -1094,17 +1098,16 @@
           <p class="q-mb-sm">Sending to ATM:</p>
           <q-list dense bordered>
             <q-item v-for="row in machineDetail.cassetteEdits"
-                    :key="row.denomination">
+                    :key="row.position">
               <q-item-section>
                 <q-item-label>
-                  <b v-text="row.denomination + ' ' +
-                             (machineDetail.machine.fiat_code || '')"></b>
+                  <b v-text="'Bay ' + row.position"></b>
                 </q-item-label>
               </q-item-section>
               <q-item-section side>
                 <q-item-label caption>
-                  position
-                  <b v-text="row.position"></b>
+                  <b v-text="row.denomination + ' ' +
+                             (machineDetail.machine.fiat_code || '')"></b>
                   · count
                   <b v-text="row.count"></b>
                 </q-item-label>