diff --git a/ValblazeProject/Factories/ItemFactory.cs b/ValblazeProject/Factories/ItemFactory.cs
index 143eeb3..8c49500 100644
--- a/ValblazeProject/Factories/ItemFactory.cs
+++ b/ValblazeProject/Factories/ItemFactory.cs
@@ -15,7 +15,8 @@ namespace ValblazeProject.Factories
                 EnchantCategories = item.EnchantCategories,
                 MaxDurability = item.MaxDurability,
                 StackSize = item.StackSize,
-                ImageContent = imageContent
+                ImageContent = imageContent,
+                ImageBase64 = string.IsNullOrWhiteSpace(item.ImageBase64) ? Convert.ToBase64String(imageContent) : item.ImageBase64
             };
         }
 
@@ -30,7 +31,8 @@ namespace ValblazeProject.Factories
                 EnchantCategories = model.EnchantCategories,
                 MaxDurability = model.MaxDurability,
                 StackSize = model.StackSize,
-                CreatedDate = DateTime.Now
+                CreatedDate = DateTime.Now,
+                ImageBase64 = Convert.ToBase64String(model.ImageContent)
             };
         }
 
@@ -43,6 +45,7 @@ namespace ValblazeProject.Factories
             item.MaxDurability = model.MaxDurability;
             item.StackSize = model.StackSize;
             item.UpdatedDate = DateTime.Now;
+            item.ImageBase64 = Convert.ToBase64String(model.ImageContent);
         }
     }
 }
diff --git a/ValblazeProject/Pages/Edit.razor b/ValblazeProject/Pages/Edit.razor
index e3a7890..3967825 100644
--- a/ValblazeProject/Pages/Edit.razor
+++ b/ValblazeProject/Pages/Edit.razor
@@ -52,6 +52,12 @@
             }
         </div>
     </p>
+    <p>
+        <label>
+            Current Item image:
+            <img src="data:image/png;base64, @(itemModel.ImageBase64)" class="img-thumbnail" title="@itemModel.DisplayName" alt="@itemModel.DisplayName" style="min-width: 50px; max-width: 150px" />
+        </label>
+    </p>
     <p>
         <label>
             Current Item image:
diff --git a/ValblazeProject/Pages/List.razor b/ValblazeProject/Pages/List.razor
index 4570e93..1f5fb1e 100644
--- a/ValblazeProject/Pages/List.razor
+++ b/ValblazeProject/Pages/List.razor
@@ -29,6 +29,18 @@
             }
         </DisplayTemplate>
     </DataGridColumn>
+    <DataGridColumn TItem="Item" Field="@nameof(Item.Id)" Caption="Image">
+        <DisplayTemplate>
+                @if (!string.IsNullOrWhiteSpace(context.ImageBase64))
+                {
+                    <img src="data:image/png;base64, @(context.ImageBase64)" class="img-thumbnail" title="@context.DisplayName" alt="@context.DisplayName" style="min-width: 50px; max-width: 150px" />
+                }
+                else
+                {
+                    <img src="images/default.png" class="img-thumbnail" title="@context.DisplayName" alt="@context.DisplayName" style="max-width: 150px"/>
+                }
+        </DisplayTemplate>
+    </DataGridColumn>
     <DataGridColumn TItem="Item" Field="@nameof(Item.DisplayName)" Caption="Display name" />
     <DataGridColumn TItem="Item" Field="@nameof(Item.StackSize)" Caption="Stack size" />
     <DataGridColumn TItem="Item" Field="@nameof(Item.MaxDurability)" Caption="Maximum durability" />
diff --git a/ValblazeProject/Program.cs b/ValblazeProject/Program.cs
index ff63ff1..a88adbd 100644
--- a/ValblazeProject/Program.cs
+++ b/ValblazeProject/Program.cs
@@ -16,7 +16,7 @@ var builder = WebApplication.CreateBuilder(args);
 // Add services to the container.
 
 builder.Services.AddScoped<IDataService, DataLocalService>();
-builder.Services.AddScoped<IDataService, DataApiService>();
+builder.Services.AddScoped<IDataService, DataApiService>(); // API ici
 
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();