diff --git a/web/Controllers/CustomerController.cs b/web/Controllers/CustomerController.cs
index dec7e0c..9598608 100644
--- a/web/Controllers/CustomerController.cs
+++ b/web/Controllers/CustomerController.cs
@@ -127,6 +127,7 @@ public async Task<IActionResult> Details(int? id)
         }
 
         // GET: Customer/Create
+        [Authorize(Roles = "Administrator, Manager")]
         public IActionResult Create()
         {
             return View();
@@ -149,6 +150,7 @@ public async Task<IActionResult> Create([Bind("ID,FirstName,LastName,Address,ZIP
         }
 
         // GET: Customer/Edit/5
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Edit(int? id)
         {
             if (id == null)
@@ -200,6 +202,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,FirstName,LastName,Addre
         }
 
         // GET: Customer/Delete/5
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Delete(int? id)
         {
             if (id == null)
diff --git a/web/Controllers/DistributorController.cs b/web/Controllers/DistributorController.cs
index 5b98b58..9892394 100644
--- a/web/Controllers/DistributorController.cs
+++ b/web/Controllers/DistributorController.cs
@@ -120,6 +120,7 @@ public async Task<IActionResult> Details(int? id)
         }
 
         // GET: Distributor/Create
+        [Authorize(Roles = "Administrator, Manager")]
         public IActionResult Create()
         {
             return View();
@@ -142,6 +143,7 @@ public async Task<IActionResult> Create([Bind("ID,Name,Address,ZIP,City,Country"
         }
 
         // GET: Distributor/Edit/5
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Edit(int? id)
         {
             if (id == null)
@@ -193,6 +195,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,Name,Address,ZIP,City,Co
         }
 
         // GET: Distributor/Delete/5
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Delete(int? id)
         {
             if (id == null)
diff --git a/web/Controllers/EvidenceController.cs b/web/Controllers/EvidenceController.cs
index 5fd3029..fea669a 100644
--- a/web/Controllers/EvidenceController.cs
+++ b/web/Controllers/EvidenceController.cs
@@ -149,6 +149,7 @@ public async Task<IActionResult> Create([Bind("ID,ItemID,WarehouseID,CustomerID,
         }
 
         // GET: Evidence/Edit/5
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Edit(int? id)
         {
             if (id == null)
@@ -206,6 +207,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,ItemID,WarehouseID,Custo
         }
 
         // GET: Evidence/Delete/5
+        [Authorize(Roles = "Administrator, Manager")]
         public async Task<IActionResult> Delete(int? id)
         {
             if (id == null)
diff --git a/web/Views/Customer/Index.cshtml b/web/Views/Customer/Index.cshtml
index 81d282f..0004da9 100644
--- a/web/Views/Customer/Index.cshtml
+++ b/web/Views/Customer/Index.cshtml
@@ -67,9 +67,14 @@
                     @Html.DisplayFor(modelItem => item.Country)
                 </td>
                 <td>
-                    <a asp-action="Edit" asp-route-id="@item.ID">Edit</a> |
-                    <a asp-action="Details" asp-route-id="@item.ID">Details</a> |
-                    <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
+                    <a asp-action="Details" asp-route-id="@item.ID">Details</a>
+                    @if (User.Identity.IsAuthenticated)
+                    {
+                        if (User.IsInRole("Administrator") || User.IsInRole("Manager")) {
+                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                            <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
+                        }
+                    }
                 </td>
             </tr>
     }
diff --git a/web/Views/Distributor/Index.cshtml b/web/Views/Distributor/Index.cshtml
index 19357eb..516b16e 100644
--- a/web/Views/Distributor/Index.cshtml
+++ b/web/Views/Distributor/Index.cshtml
@@ -60,9 +60,15 @@
                     @Html.DisplayFor(modelItem => item.Country)
                 </td>
                 <td>
-                    <a asp-action="Edit" asp-route-id="@item.ID">Edit</a> |
-                    <a asp-action="Details" asp-route-id="@item.ID">Details</a> |
-                    <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
+                    <a asp-action="Details" asp-route-id="@item.ID">Details</a>
+                    @if (User.Identity.IsAuthenticated)
+                    {
+                        if (User.IsInRole("Administrator") || User.IsInRole("Manager"))
+                        {
+                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                            <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
+                        }
+                    }
                 </td>
             </tr>
     }
diff --git a/web/Views/Evidence/Index.cshtml b/web/Views/Evidence/Index.cshtml
index 49a3f40..45188a4 100644
--- a/web/Views/Evidence/Index.cshtml
+++ b/web/Views/Evidence/Index.cshtml
@@ -55,9 +55,17 @@
                     @Html.DisplayFor(modelItem => item.Customer.LastName), @Html.DisplayFor(modelItem => item.Customer.FirstName)
                 </td>
                 <td>
-                    <a asp-action="Edit" asp-route-id="@item.ID">Edit</a> |
-                    <a asp-action="Details" asp-route-id="@item.ID">Details</a> |
-                    <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
+                    <a asp-action="Details" asp-route-id="@item.ID">Details</a>
+                    @if (User.Identity.IsAuthenticated)
+                    {
+
+                        if (User.IsInRole("Administrator") || User.IsInRole("Manager"))
+                        {
+                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                            <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>  
+                        }
+                    }
+                    
                 </td>
             </tr>
     }
diff --git a/web/Views/Item/Index.cshtml b/web/Views/Item/Index.cshtml
index 2a20471..be9f771 100644
--- a/web/Views/Item/Index.cshtml
+++ b/web/Views/Item/Index.cshtml
@@ -10,6 +10,18 @@
 
 <div class="border rounded-3 p-4 shadow">
 
+<form asp-action="Index" method="get">
+    <div class="form-actions no-color">
+        <p>
+            Find by name: <input type="text" name="SearchString" value="@ViewData["CurrentFilter"]" />
+            <input type="submit" value="Search" class="btn border border-primary btn-default" />
+            @* Filter by activity: <input type="checkbox" name="activeBool" value="@ViewData["ActiveFilter"]" />
+            <input type="submit" value="Confirm" class="btn btn-default" /> | *@
+            <a asp-action="Index" class="btn border border-primary btn-default">Clear filter</a>
+            <a asp-action="Create" class="no-decor btn btn-primary float-end">Add New</a>
+        </p>
+    </div>
+</form>
 
     <form asp-action="Index" method="get">
         <div class="form-actions no-color">
diff --git a/web/Views/Warehouse/Index.cshtml b/web/Views/Warehouse/Index.cshtml
index c27ea8e..4a45372 100644
--- a/web/Views/Warehouse/Index.cshtml
+++ b/web/Views/Warehouse/Index.cshtml
@@ -58,13 +58,12 @@
                     {
                         if (User.IsInRole("Manager"))
                         {
-                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                           <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
                         }
                         else if (User.IsInRole("Administrator"))
                         {
-                            <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
-                            <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
-                            <a asp-action="Create" asp-route-id="@item.ID">Create</a>
+                           <a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
+                           <a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
                         }
                     }
                 </td>