diff --git a/views/admin/table/contents.html b/views/admin/table/contents.html
index 42ec6e3..f07072c 100644
--- a/views/admin/table/contents.html
+++ b/views/admin/table/contents.html
@@ -39,7 +39,7 @@
     <tr class="table-row">
     {{ range $header := .headers }}
     <td>
-        <a style='text-decoration: none' href='/admin/table/{{ $.table }}/${item.Id}/'>
+        <a style='text-decoration: none' href='/admin/table/{{ $.table }}/${item.Id}'>
           ${item["{{$header}}"]}
         </a>
     </td>
diff --git a/views/admin/table/view.html b/views/admin/table/view.html
index a6c132e..90fb1ec 100644
--- a/views/admin/table/view.html
+++ b/views/admin/table/view.html
@@ -1,17 +1,31 @@
 <!-- HAS_ALPINE -->
-<h1><a href="/admin/table/{{ .table }}/">&laquo;</a>Admin {{ .table }}</h1>
 
-<block x-data="{item: {}}"
-       x-init="item = await GetJson('/api/admin/table/{{ .table }}/{{ .id }}')">
+<script>
+
+$boot(async () => {
+  let item = await GetJson('/api/admin/table/{{ .table }}/{{ .id }}');
+  let data = [];
+
+  for(let key of Object.keys(item)) {
+    data.push({key, value: item[key]});
+  }
+
+  $render_data('data-template', 'data-form', data);
+});
+
+</script>
+
+<h1><a href="/admin/table/{{ .table }}/">&laquo;</a>Admin {{ .table }}</h1>
 
+<block>
   <form method="POST" action="/api/admin/table/{{ .table }}/{{ .id }}">
     <card>
     <top><h1>{{ .table }} : {{ .id }}</h1></top>
-    <middle>
-      <template x-for="(value, key) in item">
+    <middle id="data-form">
+      <template id="data-template">
         <div>
-          <label x-text="key" x-bind:for="key"></label>
-          <input x-bind:name="key" x-text="value" x-model="item[key]" x-bind:id="key" />
+          <label for="${item.key}">${item.key}</label>
+          <input name="${item.key}" value="${item.value}" />
         </div>
       </template>
     </middle>