diff --git a/app/components/royal-table/column/sorting-icon.hbs b/app/components/royal-table/column/sorting-icon.hbs
index 8a56eb0..cc1160a 100644
--- a/app/components/royal-table/column/sorting-icon.hbs
+++ b/app/components/royal-table/column/sorting-icon.hbs
@@ -1,11 +1,11 @@
 <span ...attributes>
   {{#if @sortable}}
     {{#if @isAscSorted}}
-      🠗
+      <MdIcon::ArrowDown />
     {{else if @isDescSorted}}
-      🠕
+      <MdIcon::ArrowUp />
     {{else}}
-      ⬍
+      <MdIcon::ArrowUpDown />
     {{/if}}
   {{/if}}
 </span>
diff --git a/app/templates/admin/indexes/item/data.hbs b/app/templates/admin/indexes/item/data.hbs
index b18f633..d18fb87 100644
--- a/app/templates/admin/indexes/item/data.hbs
+++ b/app/templates/admin/indexes/item/data.hbs
@@ -29,15 +29,17 @@
       @data={{@model.data.hits}}
       @sortingProp={{this.sort}}
       @onSort={{this.onSort}}
-      class="w-full" as |Column rowData|
+      class="w-full" as |Row data|
     >
-      {{#each this.sortedFields as |field|}}
-        <Column @name={{capitalize field}} @prop={{field}} @sortable={{includes field @model.sortableAttributes}}>
-          {{#let (get rowData field) as |value|}}
-            {{if (eq (type-of value) 'object') (stringify value) value}}
-          {{/let}}
-        </Column>
-      {{/each}}
+      <Row as |Column|>
+        {{#each this.sortedFields as |field|}}
+          <Column @name={{capitalize field}} @prop={{field}} @sortable={{includes field @model.sortableAttributes}}>
+            {{#let (get data field) as |value|}}
+              {{if (eq (type-of value) 'object') (stringify value) value}}
+            {{/let}}
+          </Column>
+        {{/each}}
+      </Row>
     </RoyalTable>
   {{/if}}
   {{!-- {{#if (eq this.dataView 'map')}}
diff --git a/app/templates/admin/indexes/item/settings.hbs b/app/templates/admin/indexes/item/settings.hbs
index 0ff04f8..43d6b73 100644
--- a/app/templates/admin/indexes/item/settings.hbs
+++ b/app/templates/admin/indexes/item/settings.hbs
@@ -2,32 +2,34 @@
 <label class="mb-2">
   Attributes
 </label>
-<RoyalTable @data={{@model.attributes}} as |Column dataRow|>
-  <Column @prop="name" />
-  <Column @name="Displayed">
-    <InputCheckbox
-      @checked={{dataRow.displayed}}
-      @onChange={{set dataRow 'displayed'}}
-    />
-  </Column>
-  <Column @name="Filterable">
-    <InputCheckbox
-      @checked={{dataRow.filterable}}
-      @onChange={{set dataRow 'filterable'}}
-    />
-  </Column>
-  <Column @name="Searchable">
-    <InputCheckbox
-      @checked={{dataRow.searchable}}
-      @onChange={{set dataRow 'searchable'}}
-    />
-  </Column>
-  <Column @name="Sortable">
-    <InputCheckbox
-      @checked={{dataRow.sortable}}
-      @onChange={{set dataRow 'sortable'}}
-    />
-  </Column>
+<RoyalTable @data={{@model.attributes}} as |Row data|>
+  <Row as |Column|>
+    <Column @prop="name" />
+    <Column @name="Displayed">
+      <InputCheckbox
+        @checked={{data.displayed}}
+        @onChange={{set data 'displayed'}}
+      />
+    </Column>
+    <Column @name="Filterable">
+      <InputCheckbox
+        @checked={{data.filterable}}
+        @onChange={{set data 'filterable'}}
+      />
+    </Column>
+    <Column @name="Searchable">
+      <InputCheckbox
+        @checked={{data.searchable}}
+        @onChange={{set data 'searchable'}}
+      />
+    </Column>
+    <Column @name="Sortable">
+      <InputCheckbox
+        @checked={{data.sortable}}
+        @onChange={{set data 'sortable'}}
+      />
+    </Column>
+  </Row>
 </RoyalTable>
 <InputSelect
   @label="Distinct attribute"