diff --git a/frontend/js/i18n/en.js b/frontend/js/i18n/en.js
index 9359ccf..7dd03dc 100644
--- a/frontend/js/i18n/en.js
+++ b/frontend/js/i18n/en.js
@@ -1499,6 +1499,7 @@ export default {
   'layout.properties': 'Properties',
   'layout.delete_zone': 'Delete Zone',
   'layout.zone_n': 'Zone {n}',
+  'layout.rename': 'Layout name — click to rename',
   'layout.prop.name': 'Name',
   'layout.prop.x': 'X (%)',
   'layout.prop.y': 'Y (%)',
diff --git a/frontend/js/views/layout-editor.js b/frontend/js/views/layout-editor.js
index 51f4900..07ca8a5 100644
--- a/frontend/js/views/layout-editor.js
+++ b/frontend/js/views/layout-editor.js
@@ -116,7 +116,12 @@ async function renderEditor(container, layoutId) {
       ${t('layout.back')}
     </a>
     <div class="page-header">
-      <h1 id="layoutName">${esc(layout.name)}</h1>
+      <!-- Editable in place. Duplicating a template names the copy "<template> (Copy)" and there
+           was nowhere at all to change it — the only name field in this editor belongs to the
+           selected ZONE, which is easy to mistake for the layout's own. Reported on #234. -->
+      <input id="layoutName" class="input" value="${esc(layout.name)}"
+             aria-label="${t('layout.rename')}" title="${t('layout.rename')}"
+             style="font-size:24px;font-weight:600;background:transparent;border:1px solid transparent;padding:2px 6px;max-width:420px">
       <div style="display:flex;gap:8px">
         <button class="btn btn-secondary btn-sm" id="addZoneBtn">${t('layout.add_zone')}</button>
         <button class="btn btn-primary btn-sm" id="saveLayoutBtn">${t('common.save')}</button>
@@ -297,9 +302,12 @@ async function renderEditor(container, layoutId) {
       // exactly. The old per-zone delete-then-add loop could accumulate zones
       // (and regenerated every zone id each save). Keep each zone's id so
       // device->zone assignments survive.
+        const newName = (document.getElementById('layoutName')?.value || '').trim();
       const updated = await API(`/layouts/${layoutId}`, {
         method: 'PUT',
-        body: JSON.stringify({ zones }),
+        // Name goes with the zones so renaming is part of the Save the user already
+        // presses, not a second hidden action.
+        body: JSON.stringify(newName ? { zones, name: newName } : { zones }),
       });
       if (updated && updated.error) { showToast(updated.error, 'error'); return; }
       layout = updated;
diff --git a/server/routes/layouts.js b/server/routes/layouts.js
index daa9adc..9510b43 100644
--- a/server/routes/layouts.js
+++ b/server/routes/layouts.js
@@ -145,6 +145,22 @@ router.put('/:id', (req, res) => {
 
   const updated = db.prepare('SELECT * FROM layouts WHERE id = ?').get(req.params.id);
   updated.zones = db.prepare('SELECT * FROM layout_zones WHERE layout_id = ? ORDER BY sort_order').all(req.params.id);
+  // Push to the displays using this layout. Editing a layout used to notify nothing at all, so a
+  // zone change waited for the next heartbeat refresh at best — and on Android it did not apply
+  // even then, because the rebuild was keyed on the layout ID, which does not change when you edit
+  // a layout in place. Reported on #234 as "I added 4 zones and they dont appear on the screen".
+  // The player-side fix makes the rebuild happen; this makes it happen promptly.
+  try {
+    const io = req.app.get('io');
+    if (io) {
+      const { buildPlaylistPayload } = require('../ws/deviceSocket');
+      const commandQueue = require('../lib/command-queue');
+      for (const d of db.prepare('SELECT id FROM devices WHERE layout_id = ?').all(req.params.id)) {
+        commandQueue.queueOrEmitPlaylistUpdate(io.of('/device'), d.id, buildPlaylistPayload);
+      }
+    }
+  } catch (e) { /* best-effort; the heartbeat refresh still picks it up */ }
+
   res.json(updated);
 });