diff --git a/CS/.idea/.idea.InstantFeedback/.idea/.gitignore b/CS/.idea/.idea.InstantFeedback/.idea/.gitignore
new file mode 100644
index 0000000..38eed0c
--- /dev/null
+++ b/CS/.idea/.idea.InstantFeedback/.idea/.gitignore
@@ -0,0 +1,15 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/.idea.InstantFeedback.iml
+/projectSettingsUpdater.xml
+/modules.xml
+/contentModel.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/CS/.idea/.idea.InstantFeedback/.idea/.name b/CS/.idea/.idea.InstantFeedback/.idea/.name
new file mode 100644
index 0000000..f2b9612
--- /dev/null
+++ b/CS/.idea/.idea.InstantFeedback/.idea/.name
@@ -0,0 +1 @@
+InstantFeedback
\ No newline at end of file
diff --git a/CS/.idea/.idea.InstantFeedback/.idea/indexLayout.xml b/CS/.idea/.idea.InstantFeedback/.idea/indexLayout.xml
new file mode 100644
index 0000000..7b08163
--- /dev/null
+++ b/CS/.idea/.idea.InstantFeedback/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/CS/.idea/.idea.InstantFeedback/.idea/vcs.xml b/CS/.idea/.idea.InstantFeedback/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/CS/.idea/.idea.InstantFeedback/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/CS/InstantFeedback.csproj b/CS/InstantFeedback.csproj
index bf047da..d99ccfb 100644
--- a/CS/InstantFeedback.csproj
+++ b/CS/InstantFeedback.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DevExpress.Blazor" Version="25.1.3" />
+    <PackageReference Include="DevExpress.Blazor" Version="26.1.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
diff --git a/CS/Pages/Grid.razor b/CS/Pages/Grid.razor
index 4b9457b..91fbd2f 100644
--- a/CS/Pages/Grid.razor
+++ b/CS/Pages/Grid.razor
@@ -3,23 +3,32 @@
 @using InstantFeedback.Models;
 
 <DxGrid Data="Issues" ShowSearchBox=true
-        PageSize="50"
         FilterMenuButtonDisplayMode="GridFilterMenuButtonDisplayMode.Always"
         ShowGroupPanel=true
+        EditMode="GridEditMode.EditRow"
+        ShowFilterRow="true"
+        VirtualScrollingEnabled="true"
         CssClass="h-100"
         TextWrapEnabled=true
         KeyFieldName="Id">
     <Columns>
-        <DxGridDataColumn FieldName="Id" Width="100" />
-        <DxGridDataColumn FieldName="Subject" />
-        <DxGridDataColumn FieldName="UserId" Caption="User" Width="250">
-            <EditSettings>
-                <DxComboBoxSettings Data="Users" ValueFieldName="Id" TextFieldName="FullName" />
-            </EditSettings>
+        <DxGridCommandColumn Width="90"/>
+        <DxGridDataColumn FieldName="Id" Width="100" DataRowEditorVisible="false"/>
+        <DxGridDataColumn FieldName="Subject"/>
+        <DxGridDataColumn FieldName="User.FullName" Caption="User" Width="250">
+            <CellEditTemplate>
+                @{
+                    var issue = (ServerMode.IssueWithUser)context.EditModel;
+                }
+                <DxComboBox TValue="ServerMode.UserInfo" TData="ServerMode.UserInfo" Data="Users" Value="issue.User" KeyFieldName="@nameof(ServerMode.UserInfo.Id)"
+                            ValidationEnabled="false"
+                            SelectedDataItemChanged="s => issue.User = s.DataItem" TextFieldName="@nameof(ServerMode.UserInfo.FullName)"
+                            ListRenderMode="ListRenderMode.Virtual"/>
+            </CellEditTemplate>
         </DxGridDataColumn>
-        <DxGridDataColumn FieldName="Created" Width="100" />
-        <DxGridDataColumn FieldName="Votes" Width="150" />
-        <DxGridDataColumn FieldName="Priority" Width="150" />
+        <DxGridDataColumn FieldName="Created" Width="100"/>
+        <DxGridDataColumn FieldName="Votes" Width="150"/>
+        <DxGridDataColumn FieldName="Priority" Width="150"/>
     </Columns>
     <GroupSummary>
         <DxGridSummaryItem FieldName="Id" SummaryType="GridSummaryItemType.Count" />
@@ -30,5 +39,5 @@
     public object Issues { get; set; }
 
     [Parameter]
-    public IEnumerable<User> Users { get; set; }
+    public IEnumerable<ServerMode.UserInfo> Users { get; set; }
 }
diff --git a/CS/Pages/LocalData.razor b/CS/Pages/LocalData.razor
deleted file mode 100644
index c80dc59..0000000
--- a/CS/Pages/LocalData.razor
+++ /dev/null
@@ -1,17 +0,0 @@
-@page "/localdata"
-@using InstantFeedback.Models;
-@using Microsoft.EntityFrameworkCore;
-@inject IssuesContext Context
-
-<Grid Issues="issues" Users="users" />
-
-@code {
-    IEnumerable<Issue> issues { get; set; }
-    IEnumerable<User> users;
-
-    protected override void OnInitialized()
-    {
-        issues = Context.Issues.ToList();
-        users = Context.Users.ToList();
-    }
-}
\ No newline at end of file
diff --git a/CS/Pages/ServerMode.razor b/CS/Pages/ServerMode.razor
index a7b8fa8..188d2dc 100644
--- a/CS/Pages/ServerMode.razor
+++ b/CS/Pages/ServerMode.razor
@@ -8,21 +8,43 @@
 <Grid Issues="instantFeedbackSource" Users="users" />
 
 @code {
-    EntityInstantFeedbackSource instantFeedbackSource { get; set; }
-    IEnumerable<User> users;
+    GridDevExtremeDataSource<IssueWithUser> instantFeedbackSource { get; set; }
+    IEnumerable<UserInfo> users;
 
-    protected override void OnInitialized()
-    {
-        instantFeedbackSource = new EntityInstantFeedbackSource(e =>
-        {
-            e.KeyExpression = "Id";
-            e.QueryableSource = Context.Issues;
+    protected override void OnInitialized() {
+        var userQuery = Context.Issues.Include("User").Select(i => new IssueWithUser {
+            Id = i.Id,
+            Subject = i.Subject,
+            User = new UserInfo {
+                Id = i.UserId,
+                FullName = i.User.FirstName + " " + i.User.LastName,
+            },
+            Created = i.Created,
+            Votes = i.Votes,
+            Priority = i.Priority,
+        });
+        instantFeedbackSource = new GridDevExtremeDataSource<IssueWithUser>(userQuery);
+        users = Context.Users.Select(u => new UserInfo {
+            Id = u.Id,
+            FullName = u.FullName
         });
-        users = Context.Users.ToList();
     }
 
     public void Dispose()
     {
-        instantFeedbackSource?.Dispose();
     }
+    public class IssueWithUser {
+        public int Id { get; set; }
+        public string Subject { get; set; }
+        public UserInfo User { get; set; }
+        public DateTime Created { get; set; }
+        public int Votes { get; set; }
+        public Priority Priority { get; set; }
+    }
+    public class UserInfo {
+        public int Id { get; set; }
+        public string FullName { get; set; }
+    }
+
 }
+
diff --git a/CS/Program.cs b/CS/Program.cs
index 9660510..f143535 100644
--- a/CS/Program.cs
+++ b/CS/Program.cs
@@ -13,13 +13,13 @@
     options.SizeMode = DevExpress.Blazor.SizeMode.Medium;
 });
 
-//builder.Services.AddDbContext<IssuesContext>((sp, options) =>
-//{
-//    var env = sp.GetRequiredService<IWebHostEnvironment>();
-//    var dbPath = Path.Combine(env.ContentRootPath, "Issues.mdf");
-//    options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Integrated Security=true;AttachDbFileName=" + dbPath);
-//}, contextLifetime: ServiceLifetime.Transient);
-builder.Services.AddDbContext<IssuesContext>((sp, options) => options.UseInMemoryDatabase("Issues"), contextLifetime: ServiceLifetime.Transient);
+builder.Services.AddDbContext<IssuesContext>((sp, options) =>
+{
+    var env = sp.GetRequiredService<IWebHostEnvironment>();
+    var dbPath = Path.Combine(env.ContentRootPath, "Issues.mdf");
+    options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Integrated Security=true;AttachDbFileName=" + dbPath);
+}, contextLifetime: ServiceLifetime.Transient);
+// builder.Services.AddDbContext<IssuesContext>((sp, options) => options.UseInMemoryDatabase("Issues"), contextLifetime: ServiceLifetime.Transient);
 builder.Services.AddTransient<IssuesContextInitializer>();
 
 
diff --git a/CS/appsettings.Development.json b/CS/appsettings.Development.json
index 770d3e9..f760d7b 100644
--- a/CS/appsettings.Development.json
+++ b/CS/appsettings.Development.json
@@ -3,7 +3,9 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore.Database.Command": "Information",
+      "Microsoft.EntityFrameworkCore": "Information"
     }
   }
 }