diff --git a/AyCode.Blazor.Components/Components/Grids/MgGridDataColumn.cs b/AyCode.Blazor.Components/Components/Grids/MgGridDataColumn.cs
index a0083c2..93b0746 100644
--- a/AyCode.Blazor.Components/Components/Grids/MgGridDataColumn.cs
+++ b/AyCode.Blazor.Components/Components/Grids/MgGridDataColumn.cs
@@ -78,9 +78,12 @@ public class MgGridDataColumn : DxGridDataColumn
     internal static string BuildUrlFromTemplate(string template, object? dataItem)
     {
         if (dataItem == null) return template;
+
         return Regex.Replace(template, "{([^}]+)}", match =>
         {
             var propName = match.Groups[1].Value;
+
+            //TODO: delegate-et kéne használni és cache-elni egy dictionary-ba! - J.
             var prop = dataItem.GetType().GetProperty(propName);
             if (prop != null)
             {
diff --git a/AyCode.Blazor.Components/Components/Grids/MgGridToolbarTemplate.razor b/AyCode.Blazor.Components/Components/Grids/MgGridToolbarTemplate.razor
index 03f933d..75885d3 100644
--- a/AyCode.Blazor.Components/Components/Grids/MgGridToolbarTemplate.razor
+++ b/AyCode.Blazor.Components/Components/Grids/MgGridToolbarTemplate.razor
@@ -1,8 +1,8 @@
 @using AyCode.Blazor.Components.Components.Grids
 
 <MgGridToolbarBase @ref="GridToolbar" Grid="Grid" ItemRenderStyleMode="ToolbarRenderStyleMode.Plain" ShowOnlyIcon="ShowOnlyIcon">
-	<DxToolbarItem Text="@(ShowOnlyIcon ? "" : "New")" Click="NewItem_Click" IconCssClass="grid-new-row" Visible="@(!IsEditing)" Enabled="@(!IsSyncing)" />
-	<DxToolbarItem Text="@(ShowOnlyIcon ? "" : "Edit")" Click="EditItem_Click" IconCssClass="grid-edit-row" Visible="@(!IsEditing)" Enabled="@(HasFocusedRow && !IsSyncing)" />
+	<DxToolbarItem Text="@(ShowOnlyIcon ? "" : "New")" Click="NewItem_Click" IconCssClass="grid-new-row" Visible="@(!IsEditing)" Enabled="@(EnableNew && !IsSyncing)" />
+	<DxToolbarItem Text="@(ShowOnlyIcon ? "" : "Edit")" Click="EditItem_Click" IconCssClass="grid-edit-row" Visible="@(!IsEditing)" Enabled="@(EnableEdit && HasFocusedRow && !IsSyncing)" />
 	<DxToolbarItem Text="@(ShowOnlyIcon ? "" : "Delete")" Click="DeleteItem_Click" IconCssClass="grid-delete-row" Visible="@(!IsEditing)" Enabled="@(EnableDelete && HasFocusedRow && !IsSyncing)" />
 
 	<DxToolbarItem Text="@(ShowOnlyIcon ? "" : "Save")" Click="SaveItem_Click" IconCssClass="grid-save" Visible="@IsEditing" RenderStyle="ButtonRenderStyle.Primary" />
@@ -40,7 +40,10 @@
 	[Parameter] public IMgGridBase Grid { get; set; } = null!;
 	[Parameter] public RenderFragment? ToolbarItemsExtended { get; set; }
 	[Parameter] public EventCallback<ToolbarItemClickEventArgs> OnReloadDataClick { get; set; }
+
 	[Parameter] public bool ShowOnlyIcon { get; set; } = false;
+	[Parameter] public bool EnableNew { get; set; } = true;
+	[Parameter] public bool EnableEdit { get; set; } = true;
 	[Parameter] public bool EnableDelete { get; set; } = false;
 
 	public MgGridToolbarBase GridToolbar { get; set; } = null!;