diff --git a/FoodsharingSiegen.Server/Controls/InteractionRow.razor b/FoodsharingSiegen.Server/Controls/InteractionRow.razor
index 0cfbcd3..f4414e5 100644
--- a/FoodsharingSiegen.Server/Controls/InteractionRow.razor
+++ b/FoodsharingSiegen.Server/Controls/InteractionRow.razor
@@ -23,7 +23,7 @@
 
                         @if ((Prospect is not { Complete: true } || interaction.Type == InteractionType.Complete) && AllowInteraction)
                         {
-                            <span>&nbsp;<a href=""><i class="fa-solid fa-square-xmark" @onclick="async () => await RemoveClick.InvokeAsync(interaction.Id)" @onclick:preventDefault></i></a></span>
+                            <span>&nbsp;<a href=""><i class="fa-solid fa-square-xmark" @onclick="async () => { if (RemoveClick != null) await RemoveClick.Invoke(interaction.Id); }" @onclick:preventDefault></i></a></span>
                         }
                     </div>
                     
diff --git a/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs b/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs
index 72b5378..ecd7488 100644
--- a/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs
+++ b/FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs
@@ -62,7 +62,7 @@ namespace FoodsharingSiegen.Server.Controls
         ///     Gets or sets the value of the remove click (ab)
         /// </summary>
         [Parameter]
-        public EventCallback<Guid> RemoveClick { get; set; }
+        public Func<Guid, Task>? RemoveClick { get; set; }
 
         /// <summary>
         ///     Gets or sets the value of the type (ab)
diff --git a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor
index 7373fcc..98af0db 100644
--- a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor
+++ b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor
@@ -75,7 +75,7 @@
         <InteractionRow
             Prospect="Prospect"
             Type="InteractionType.ReleasedForVerification"
-            AllowInteraction="@(StateFilter == ProspectStateFilter.OnBoarding && CurrentUser.IsInGroup(UserGroup.WelcomeTeam))"
+            AllowInteraction="@(StateFilter is ProspectStateFilter.OnBoarding or ProspectStateFilter.Verification && CurrentUser.IsInGroup(UserGroup.WelcomeTeam))"
             AddClick="() => AddInteraction(InteractionType.ReleasedForVerification)"
             RemoveClick="@RemoveInteraction"
             Caption="Freigabe zur Verifizierung"
diff --git a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs
index eb12fce..cb47444 100644
--- a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs
+++ b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs
@@ -12,7 +12,7 @@ namespace FoodsharingSiegen.Server.Controls
         
         [Parameter] public AddProspectModal? ProspectModal { get; set; } = null!;
 
-        [Parameter] public EventCallback<Guid> RemoveInteraction { get; set; }
+        [Parameter] public Func<Guid, Task>? RemoveInteraction { get; set; }
         
         [Parameter] public ProspectStateFilter StateFilter { get; set; }
         
diff --git a/FoodsharingSiegen.Server/Controls/ProspectGrid.razor b/FoodsharingSiegen.Server/Controls/ProspectGrid.razor
new file mode 100644
index 0000000..56b6edf
--- /dev/null
+++ b/FoodsharingSiegen.Server/Controls/ProspectGrid.razor
@@ -0,0 +1,30 @@
+<h3>ProspectGrid</h3>
+
+@code {
+
+  [Parameter] public List<Prospect>? Prospects { get; set; }
+
+  [Parameter] public Func<Guid, Task>? OnRemoveInteraction { get; set; }
+  
+  [Parameter] public AddInteractionModal InteractionModal { get; set; } = null!;
+        
+  [Parameter] public AddProspectModal? ProspectModal { get; set; } = null!;
+
+  [Parameter] public ProspectStateFilter StateFilter { get; set; }
+
+}
+<h5>@(Prospects?.Count ?? 0) Einträge</h5>
+
+@if (Prospects?.Any() == true)
+{
+  <div class="row m-0">
+    <Repeater Items="@Prospects">
+      <ProspectContainer 
+        Prospect="context" 
+        InteractionModal="@InteractionModal"
+        ProspectModal="@ProspectModal"
+        RemoveInteraction="OnRemoveInteraction" 
+        StateFilter="StateFilter"></ProspectContainer>
+    </Repeater>
+  </div>
+}
\ No newline at end of file
diff --git a/FoodsharingSiegen.Server/Pages/Prospects.razor b/FoodsharingSiegen.Server/Pages/Prospects.razor
index 93714ee..3dbaad0 100644
--- a/FoodsharingSiegen.Server/Pages/Prospects.razor
+++ b/FoodsharingSiegen.Server/Pages/Prospects.razor
@@ -22,16 +22,13 @@
 <hr/>
 <ProspectFilterControl @bind-Filter="Filter"></ProspectFilterControl>
 <hr />
-<h5>@(filterList.Count) Einträge</h5>
-
-@if (filterList.Any())
-{
-    <div class="row m-0">
-        <Repeater Items="@filterList">
-            <ProspectContainer Prospect="context" InteractionModal="InteractionModal" ProspectModal="ProspectModal" RemoveInteraction="RemoveInteraction" StateFilter="ProspectStateFilter.OnBoarding"></ProspectContainer>
-        </Repeater>
-    </div>
-}
+<ProspectGrid
+    Prospects="filterList"
+    OnRemoveInteraction="RemoveInteractionAsync"
+    StateFilter="ProspectStateFilter.OnBoarding"
+    InteractionModal="InteractionModal"
+    ProspectModal="@ProspectModal">
+</ProspectGrid>
 
 <AddProspectModal @ref="ProspectModal" OnAdd="OnAddProspect" OnUpdate="OnUpdateProspect"></AddProspectModal>
 <AddInteractionModal @ref="InteractionModal" OnAdd="OnAddInteraction" Users="Users"></AddInteractionModal>
\ No newline at end of file
diff --git a/FoodsharingSiegen.Server/Pages/Prospects.razor.cs b/FoodsharingSiegen.Server/Pages/Prospects.razor.cs
index a0e0f80..b231792 100644
--- a/FoodsharingSiegen.Server/Pages/Prospects.razor.cs
+++ b/FoodsharingSiegen.Server/Pages/Prospects.razor.cs
@@ -138,7 +138,7 @@ namespace FoodsharingSiegen.Server.Pages
         ///     Removes the interaction using the specified arg (a. beging, 11.04.2022)
         /// </summary>
         /// <param name="arg">The arg</param>
-        private async Task RemoveInteraction(Guid arg)
+        private async Task RemoveInteractionAsync(Guid arg)
         {
             var confirm = await Message.Confirm("Interaktion wirklich löschen?", "Bestätigen", o =>
             {