diff --git a/website/MyWebApp/Controllers/AdminBlockTemplateController.cs b/website/MyWebApp/Controllers/AdminBlockTemplateController.cs
index 8e38870..551618a 100644
--- a/website/MyWebApp/Controllers/AdminBlockTemplateController.cs
+++ b/website/MyWebApp/Controllers/AdminBlockTemplateController.cs
@@ -36,20 +36,27 @@ public async Task<IActionResult> Index()
         return View(items);
     }
 
-    public IActionResult Create()
+    public async Task<IActionResult> Create()
     {
+        await LoadPagesAsync();
         return View(new BlockTemplate());
     }
 
     [HttpPost]
     [ValidateAntiForgeryToken]
-    public async Task<IActionResult> Create(BlockTemplate model)
+    public async Task<IActionResult> Create(BlockTemplate model, List<int>? pageIds, string? zone, string? role)
     {
-        if (!ModelState.IsValid) return View(model);
+        if (!ModelState.IsValid)
+        {
+            await LoadPagesAsync();
+            return View(model);
+        }
         model.Html = _sanitizer.Sanitize(model.Html);
         _db.BlockTemplates.Add(model);
         _db.BlockTemplateVersions.Add(new BlockTemplateVersion { Template = model, Html = model.Html });
         await _db.SaveChangesAsync();
+        await AddSectionsAsync(model, pageIds, zone, role);
+        await _db.SaveChangesAsync();
         return RedirectToAction(nameof(Index));
     }
 
@@ -57,18 +64,25 @@ public async Task<IActionResult> Edit(int id)
     {
         var item = await _db.BlockTemplates.FindAsync(id);
         if (item == null) return NotFound();
+        await LoadPagesAsync();
         return View(item);
     }
 
     [HttpPost]
     [ValidateAntiForgeryToken]
-    public async Task<IActionResult> Edit(BlockTemplate model)
+    public async Task<IActionResult> Edit(BlockTemplate model, List<int>? pageIds, string? zone, string? role)
     {
-        if (!ModelState.IsValid) return View(model);
+        if (!ModelState.IsValid)
+        {
+            await LoadPagesAsync();
+            return View(model);
+        }
         model.Html = _sanitizer.Sanitize(model.Html);
         _db.Update(model);
         _db.BlockTemplateVersions.Add(new BlockTemplateVersion { BlockTemplateId = model.Id, Html = model.Html });
         await _db.SaveChangesAsync();
+        await AddSectionsAsync(model, pageIds, zone, role);
+        await _db.SaveChangesAsync();
         return RedirectToAction(nameof(Index));
     }
 
@@ -208,4 +222,34 @@ public async Task<IActionResult> AddToPage(int id, List<int> pageIds, string zon
         return RedirectToAction(nameof(Index));
     }
 
+    private async Task AddSectionsAsync(BlockTemplate template, List<int>? pageIds, string? zone, string? role)
+    {
+        if (pageIds == null || pageIds.Count == 0 || string.IsNullOrWhiteSpace(zone))
+            return;
+        var roleEntity = await _db.Roles.FirstOrDefaultAsync(r => r.Name == role);
+        int? roleId = roleEntity?.Id;
+        zone = zone!.Trim();
+        if (pageIds.Contains(0))
+        {
+            pageIds = await _db.Pages.Select(p => p.Id).ToListAsync();
+        }
+        foreach (var pageId in pageIds)
+        {
+            var sort = await _db.PageSections
+                .Where(s => s.PageId == pageId && s.Zone == zone)
+                .Select(s => s.SortOrder)
+                .DefaultIfEmpty(-1)
+                .MaxAsync() + 1;
+            var section = new PageSection
+            {
+                PageId = pageId,
+                Zone = zone,
+                SortOrder = sort,
+                Html = template.Html,
+                Type = PageSectionType.Html,
+                RoleId = roleId
+            };
+            _db.PageSections.Add(section);
+        }
+    }
 }
diff --git a/website/MyWebApp/Views/AdminBlockTemplate/AddToPage.cshtml b/website/MyWebApp/Views/AdminBlockTemplate/AddToPage.cshtml
index f574f8d..c08e096 100644
--- a/website/MyWebApp/Views/AdminBlockTemplate/AddToPage.cshtml
+++ b/website/MyWebApp/Views/AdminBlockTemplate/AddToPage.cshtml
@@ -26,11 +26,14 @@
     </div>
     <div>
         <label>Role</label>
-        <select name="role" required>
-            <option value="">Select role</option>
-            <option value="Admin">Admin</option>
-            <option value="Editor">Editor</option>
-            <option value="Viewer">Viewer</option>
+ 
+        <select name="role">
+            <option value="">(none)</option>
+            @foreach (var r in ViewBag.Roles as List<Role>)
+            {
+                <option value="@r.Name">@r.Name</option>
+            }
+ 
         </select>
     </div>
     <button type="submit">Add</button>
diff --git a/website/MyWebApp/Views/AdminBlockTemplate/Create.cshtml b/website/MyWebApp/Views/AdminBlockTemplate/Create.cshtml
index 756c339..a53d5d4 100644
--- a/website/MyWebApp/Views/AdminBlockTemplate/Create.cshtml
+++ b/website/MyWebApp/Views/AdminBlockTemplate/Create.cshtml
@@ -17,6 +17,8 @@
             <select id="section-select" style="display:none"></select>
         </div>
     </div>
+
+    @await Html.PartialAsync("_PageAssignment")
     <button type="submit">Save</button>
 </form>
 
diff --git a/website/MyWebApp/Views/AdminBlockTemplate/Edit.cshtml b/website/MyWebApp/Views/AdminBlockTemplate/Edit.cshtml
index f82cedb..9047c6f 100644
--- a/website/MyWebApp/Views/AdminBlockTemplate/Edit.cshtml
+++ b/website/MyWebApp/Views/AdminBlockTemplate/Edit.cshtml
@@ -18,6 +18,8 @@
             <select id="section-select" style="display:none"></select>
         </div>
     </div>
+
+    @await Html.PartialAsync("_PageAssignment")
     <button type="submit">Save</button>
 </form>
 
diff --git a/website/MyWebApp/Views/AdminBlockTemplate/Index.cshtml b/website/MyWebApp/Views/AdminBlockTemplate/Index.cshtml
index 5ad8c03..64f8481 100644
--- a/website/MyWebApp/Views/AdminBlockTemplate/Index.cshtml
+++ b/website/MyWebApp/Views/AdminBlockTemplate/Index.cshtml
@@ -10,7 +10,7 @@
     <button type="submit">Import</button>
 </form>
 <table>
-    <thead><tr><th>Name</th><th></th><th></th><th></th></tr></thead>
+    <thead><tr><th>Name</th><th></th><th></th></tr></thead>
     <tbody>
 @foreach (var t in Model)
 {
@@ -18,7 +18,6 @@
         <td>@t.Name</td>
         <td><a asp-action="Edit" asp-route-id="@t.Id">Edit</a></td>
         <td><a asp-action="Delete" asp-route-id="@t.Id">Delete</a></td>
-        <td><a asp-action="AddToPage" asp-route-id="@t.Id">Add to Page</a></td>
     </tr>
 }
     </tbody>
diff --git a/website/MyWebApp/Views/AdminBlockTemplate/_PageAssignment.cshtml b/website/MyWebApp/Views/AdminBlockTemplate/_PageAssignment.cshtml
new file mode 100644
index 0000000..33945a6
--- /dev/null
+++ b/website/MyWebApp/Views/AdminBlockTemplate/_PageAssignment.cshtml
@@ -0,0 +1,41 @@
+@using MyWebApp.Models
+<div class="block-assignment">
+    <h3>Page Assignment</h3>
+    <div>
+        <label>Pages</label>
+        <input type="text" id="page-display" readonly />
+        <select id="page-select" name="pageIds" multiple size="5">
+            <option value="0">All Pages</option>
+            @foreach (var p in ViewBag.Pages as List<Page>)
+            {
+                <option value="@p.Id">@p.Slug</option>
+            }
+        </select>
+    </div>
+    <div>
+        <label>Zone</label>
+        <input type="text" name="zone" />
+    </div>
+    <div>
+        <label>Role</label>
+        <select name="role">
+            <option value="">(none)</option>
+            @foreach (var r in ViewBag.Roles as List<Role>)
+            {
+                <option value="@r.Name">@r.Name</option>
+            }
+        </select>
+    </div>
+</div>
+@section Scripts {
+<script>
+    const select = document.getElementById('page-select');
+    const display = document.getElementById('page-display');
+    function updateDisplay() {
+        const names = Array.from(select.selectedOptions).map(o => o.text);
+        display.value = names.join(', ');
+    }
+    select.addEventListener('change', updateDisplay);
+    updateDisplay();
+</script>
+}