diff --git a/src/app/component/management/management.component.css b/src/app/component/management/management.component.css
index ecd7c54..b66c9c2 100644
--- a/src/app/component/management/management.component.css
+++ b/src/app/component/management/management.component.css
@@ -139,3 +139,22 @@ th {
   display: flex;
   justify-content: flex-end;
 }
+
+.btn-container{
+  display: flex;
+}
+
+.edit{
+  background-color: #008CBA;
+  padding: 5px;
+  border-radius: 5px;
+  color: white;
+}
+
+.delete{
+  background-color: #f44336;
+  margin-left: 10px;
+  padding: 5px;
+  border-radius: 5px;
+  color: white;
+}
diff --git a/src/app/component/management/management.component.html b/src/app/component/management/management.component.html
index 37c1bdb..1301dd2 100644
--- a/src/app/component/management/management.component.html
+++ b/src/app/component/management/management.component.html
@@ -5,7 +5,7 @@
     <th>{{ translations.username }}</th>
     <th>{{translations.password}}</th>
     <th>admin</th>
-    <th></th>
+    <th>Edit</th>
   </tr>
   </thead>
   <tbody>
@@ -14,7 +14,27 @@
     <td>{{ user.password }}</td>
     <td *ngIf="user.admin==false">No</td>
     <td *ngIf="user.admin==true">Yes</td>
-    <td> </td>
+    <td>
+      <div class="btn-container">
+        <button class="edit">
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+               stroke="currentColor"
+               class="w-6 h-6">
+            <path stroke-linecap="round" stroke-linejoin="round"
+                  d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10"/>
+          </svg>
+        </button>
+
+        <button class="delete">
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+               stroke="currentColor"
+               class="w-6 h-6">
+            <path stroke-linecap="round" stroke-linejoin="round"
+                  d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"/>
+          </svg>
+        </button>
+      </div>
+    </td>
   </tr>
   </tbody>
 </table>
@@ -52,6 +72,7 @@
     <th>{{translations.region}}</th>
     <th>{{translations.lat}}</th>
     <th>{{translations.lon}}</th>
+    <th>Edit</th>
   </tr>
   </thead>
   <tbody>
@@ -60,6 +81,27 @@
     <td>{{ location.region }}</td>
     <td>{{ location.lat }}</td>
     <td>{{ location.lon }}</td>
+    <td>
+      <div class="btn-container">
+        <button class="edit">
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+               stroke="currentColor"
+               class="w-6 h-6">
+            <path stroke-linecap="round" stroke-linejoin="round"
+                  d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10"/>
+          </svg>
+        </button>
+
+        <button class="delete">
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+               stroke="currentColor"
+               class="w-6 h-6">
+            <path stroke-linecap="round" stroke-linejoin="round"
+                  d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"/>
+          </svg>
+        </button>
+      </div>
+    </td>
   </tr>
   </tbody>
 </table>
@@ -110,6 +152,7 @@
     <th>{{translations.lon}}</th>
     <th>{{translations.description}}</th>
     <th>{{translations.locationName}}</th>
+    <th>Edit</th>
   </tr>
   </thead>
   <tbody>
@@ -119,6 +162,27 @@
     <td>{{ waypoint.lon }}</td>
     <td>{{ waypoint.description }}</td>
     <td>{{ waypoint.locationName }}</td>
+    <td>
+      <div class="btn-container">
+        <button class="edit">
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+               stroke="currentColor"
+               class="w-6 h-6">
+            <path stroke-linecap="round" stroke-linejoin="round"
+                  d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10"/>
+          </svg>
+        </button>
+
+        <button class="delete">
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+               stroke="currentColor"
+               class="w-6 h-6">
+            <path stroke-linecap="round" stroke-linejoin="round"
+                  d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"/>
+          </svg>
+        </button>
+      </div>
+    </td>
   </tr>
   </tbody>
 </table>
@@ -169,7 +233,7 @@
 
       <button type="submit">{{translations.addWaypointButton}}</button>
     </form>
-    <button (click)="closeWaypointForm()" >{{translations.close}}</button>
+    <button (click)="closeWaypointForm()">{{translations.close}}</button>
   </div>
 </div>