diff --git a/BlazorApp/BlazorApp/Components/AvailableItem.razor b/BlazorApp/BlazorApp/Components/AvailableItem.razor
deleted file mode 100644
index a9b6b82..0000000
--- a/BlazorApp/BlazorApp/Components/AvailableItem.razor
+++ /dev/null
@@ -1,32 +0,0 @@
-<CascadingValue Value="@this">
-    <div class="container">
-        <div class="row">
-            <div class="col-6">
-
-                <div>Available items:</div>
-                <div>
-                    <div class="css-grid">
-
-                        @foreach (var item in Items)
-                        {
-                                <grid>
-                                    <tr>
-                                        <td>
-
-                                            <img src="data:image/png;base64, @(item.ImageBase64)" class="img-thumbnail" title="@item.DisplayName" alt="@item.DisplayName" style="min-width: 50px; max-width: 50px"/>
-                                        </td>
-                                        <td class="txt">
-                                            @item.DisplayName
-                                        </td>
-                                    </tr>
-                                </grid>
-
-
-                            }
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </div>
-</CascadingValue>
diff --git a/BlazorApp/BlazorApp/Components/AvailableItem.razor.cs b/BlazorApp/BlazorApp/Components/AvailableItem.razor.cs
deleted file mode 100644
index 106a7ab..0000000
--- a/BlazorApp/BlazorApp/Components/AvailableItem.razor.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using BlazorApp.Models;
-using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-
-namespace BlazorApp.Components
-{
-    public partial class AvailableItem
-    {
-        public Item CurrentDragItem { get; set; }
-
-        [Parameter]
-        public List<Item> Items { get; set; }
-
-        /// <summary>
-        /// Gets or sets the java script runtime.
-        /// </summary>
-        [Inject]
-        internal IJSRuntime JavaScriptRuntime { get; set; }
-
-    }
-}
-
diff --git a/BlazorApp/BlazorApp/Components/AvailableItem.razor.css b/BlazorApp/BlazorApp/Components/AvailableItem.razor.css
deleted file mode 100644
index d4c6709..0000000
--- a/BlazorApp/BlazorApp/Components/AvailableItem.razor.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.item {
-    width: 64px;
-    height: 64px;
-    border: 1px solid;
-    overflow: hidden;
-}
-.css-grid {
-    grid-template-columns: repeat(1,minmax(0,1fr));
-    gap: 10px;
-    display: grid;
-    width: 286px;
-}
-.txt {
-    width: 1000px;
-}
-img {
-    margin: 10px;
-}
\ No newline at end of file
diff --git a/BlazorApp/BlazorApp/Components/InventoryComp.razor b/BlazorApp/BlazorApp/Components/InventoryComp.razor
index 5e627f9..92de893 100644
--- a/BlazorApp/BlazorApp/Components/InventoryComp.razor
+++ b/BlazorApp/BlazorApp/Components/InventoryComp.razor
@@ -40,8 +40,8 @@
                 <div>Available items:</div>
 
                 <div>
-                    <DataGrid TItem="Item"
-                              Data="@Items"
+                    <DataGrid TItem="InventoryItem"
+                              Data="@InvItems"
                               ReadData="@OnReadData"
                               TotalItems="@totalItem"
                               PageSize="10"
@@ -49,19 +49,19 @@
                               Sortable="true">
 
                         <button type="submit" @onclick="() => SortByName()"></button>
-                        <DataGridColumn TItem="Item" Field="@nameof(Item.Id)">
+                        <DataGridColumn TItem="InventoryItem" Field="@nameof(InventoryItem.Item.Id)">
                             <DisplayTemplate>
-                                @if (!string.IsNullOrWhiteSpace(context.ImageBase64))
+                                @if (!string.IsNullOrWhiteSpace(context.Item.ImageBase64))
                                 {
-                                    <img src="data:image/png;base64, @(context.ImageBase64)" class="img-thumbnail" title="@context.DisplayName" alt="@context.DisplayName" style="min-width: 50px; max-width: 50px" />
+                                    <img src="data:image/png;base64, @(context.Item.ImageBase64)" class="img-thumbnail" title="@context.Item.DisplayName" alt="@context.Item.DisplayName" style="min-width: 50px; max-width: 50px" />
                                 }
                                 else
                                 {
-                                    <img src="images/default.png" class="img-thumbnail" title="@context.DisplayName" alt="@context.DisplayName" style="max-width: 150px" />
+                                    <img src="images/default.png" class="img-thumbnail" title="@context.Item.DisplayName" alt="@context.Item.DisplayName" style="max-width: 150px" />
                                 }
                             </DisplayTemplate>
                         </DataGridColumn>
-                        <DataGridColumn TItem="Item" Field="@nameof(Item.DisplayName)" />
+                        <DataGridColumn TItem="InventoryItem" Field="@nameof(InventoryItem.Item.DisplayName)" />
                     </DataGrid>
 
                 </div>
diff --git a/BlazorApp/BlazorApp/Components/InventoryComp.razor.cs b/BlazorApp/BlazorApp/Components/InventoryComp.razor.cs
index 182d0ae..c52d526 100644
--- a/BlazorApp/BlazorApp/Components/InventoryComp.razor.cs
+++ b/BlazorApp/BlazorApp/Components/InventoryComp.razor.cs
@@ -24,6 +24,8 @@ namespace BlazorApp.Components
 
         public List<Item> InventoryItems { get; set; }
 
+        public List<InventoryItem> InvItems { get; set; }
+
         private int totalItem;
 
         public InventoryComp()
@@ -35,7 +37,7 @@ namespace BlazorApp.Components
             }
         }
 
-        private async Task OnReadData(DataGridReadDataEventArgs<Item> e)
+        private async Task OnReadData(DataGridReadDataEventArgs<InventoryItem> e)
         {
             if (e.CancellationToken.IsCancellationRequested)
             {
@@ -46,6 +48,11 @@ namespace BlazorApp.Components
             {
                 Items = await DataService.List(e.Page, e.PageSize);
                 totalItem = await DataService.Count();
+                foreach (Item i in Items){
+                    InventoryItem newI = new InventoryItem();
+                    newI.Item = i;
+                    InvItems.Append(newI);
+                } 
             }
         }