diff --git a/src/components/EditItem.vue b/src/components/EditItem.vue
index 0f56151..e5f2a5f 100644
--- a/src/components/EditItem.vue
+++ b/src/components/EditItem.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <h6>Editing Item <span class="badge badge-secondary">#{{ item.item_uid }}</span></h6>
+        <h6>Editing Item <span class="badge badge-secondary">#{{ item.uid }}</span></h6>
         <InputPhoto
             :model="item"
             field="file"
diff --git a/src/store/index.js b/src/store/index.js
index f42bf3c..01c37b0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -65,7 +65,7 @@ const store = new Vuex.Store({
       router.push({path: `/${slug}/${view}`});
     },
     replaceLoadedItems(state, newItems) {
-      state.loadedItems = newItems.map(e => ({...e, uid: e.item_uid}));
+      state.loadedItems = newItems;
     },
     setLayout(state, layout) {
       state.layout = layout;
@@ -74,7 +74,7 @@ const store = new Vuex.Store({
       state.loadedBoxes = loadedBoxes;
     },
     updateItem(state, updatedItem) {
-      const item = state.loadedItems.filter(({ item_uid }) => item_uid === updatedItem.item_uid)[0];
+      const item = state.loadedItems.filter(({ uid }) => uid === updatedItem.uid)[0];
       Object.assign(item, updatedItem);
     },
     removeItem(state, item) {
diff --git a/src/views/Boxes.vue b/src/views/Boxes.vue
index b5176f2..6e95284 100644
--- a/src/views/Boxes.vue
+++ b/src/views/Boxes.vue
@@ -3,7 +3,7 @@
         <div class="row">
             <div class="col-xl-8 offset-xl-2">
                 <Table
-                    :columns="['cid', 'name']"
+                    :columns="['cid', 'name','itemCount']"
                     :items="loadedBoxes"
                     :keyName="'cid'"
                     v-slot="{ item }"
@@ -12,8 +12,8 @@
                     <button class="btn btn-secondary" @click.stop="showBoxContent(item.name)" >
                       <!--font-awesome-icon icon="archive"/--> content
                     </button>
-                    <button class="btn btn-danger" @click.stop="" >
-                      <font-awesome-icon icon="trash"/> delete
+                    <button class="btn btn-danger" @click.stop="" title="delete">
+                      <font-awesome-icon icon="trash"/>
                     </button>
                   </div>
                 </Table>
diff --git a/src/views/Items.vue b/src/views/Items.vue
index f414a0f..1f2f202 100644
--- a/src/views/Items.vue
+++ b/src/views/Items.vue
@@ -4,7 +4,7 @@
             <template #body>
                 <EditItem
                     :item="editingItem"
-                    badge="item_uid"
+                    badge="uid"
                 />
             </template>
             <template #buttons>