diff --git a/.gitignore b/.gitignore
index 316a346..b49a9f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,6 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# conf file
+zezere.conf
\ No newline at end of file
diff --git a/zezere/models.py b/zezere/models.py
index 731113d..e1eafc3 100644
--- a/zezere/models.py
+++ b/zezere/models.py
@@ -158,6 +158,7 @@ class Meta:
             "delete": rules.owns_device,
             "provision": rules.owns_device,
             "claim": rules.can_claim,
+            "remove_unclaimed": rules.can_claim,
         }
 
     def __str__(self):
diff --git a/zezere/templates/portal/claim.html b/zezere/templates/portal/claim.html
index 7c30c33..0d7b2f1 100644
--- a/zezere/templates/portal/claim.html
+++ b/zezere/templates/portal/claim.html
@@ -6,20 +6,42 @@
 
 {% block content %}
 {% if super %}
-Unowned devices:
+<h1>Unowned devices:</h1>
 {% else %}
-Unowned devices from this IP address:
+<h1>Unowned devices from this IP address:</h1>
 {% endif %}
-{% for device in unclaimed_devices %}
-    {% has_perm 'zezere.claim_device' user device as can_claim_device %}
-    {% if can_claim_device %}
-        <form method="POST">
-            MAC address: {{ device.mac_address }}
-            {% csrf_token %}
-            <input type="hidden" name="mac_address" value="{{ device.mac_address }}">
-            <input type="submit" value="Claim">
-        </form>
-        <br />
-    {% endif %}
-{% endfor %}
+<div class="container-fluid">
+    <table border="1" class="table">
+        <thead>
+            <tr>
+                <th>Mac Address</th>
+                <th colspan="2">Actions</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for device in unclaimed_devices %}
+                {% has_perm 'zezere.claim_device' user device as can_claim_device %}
+                {% if can_claim_device %}
+                    <tr>
+                        <td>{{ device.mac_address }}</td>
+                        <td>
+                            <form method="POST">
+                                {% csrf_token %}
+                                <input type="hidden" name="mac_address" value="{{ device.mac_address }}">
+                                <input class="btn btn-primary btn-sm" type="submit" value="Claim">
+                            </form>
+                        </td>
+                        <td>
+                            <form method="POST" action="/portal/claim/remove/">
+                                {% csrf_token %}
+                                <input type="hidden" name="device_id" value="{{ device.id }}">
+                                <input class ="btn btn-danger btn-sm" type="submit" value="Remove">
+                            </form>
+                        </td>
+                    </tr>
+                {% endif %}
+            {% endfor %}
+        </tbody>    
+    </table>
+</div>
 {% endblock %}
diff --git a/zezere/templates/portal/devices.html b/zezere/templates/portal/devices.html
index 9a6c5e7..773fda5 100644
--- a/zezere/templates/portal/devices.html
+++ b/zezere/templates/portal/devices.html
@@ -5,37 +5,56 @@
 {% block title %}Device list{% endblock %}
 
 {% block content %}
-Your devices:
-<table border="1">
-    <tr>
-        <th>Mac Address</th>
-        <th>Hostname</th>
-        <th>Run Request</th>
-        <th>Actions</th>
-    </tr>
-    {% for device in devices %}
-        {% has_perm 'zezere.view_device' user device as can_view_device %}
-        {% if can_view_device %}
+<h1>Your devices:</h1>
+<hr/>
+{% if not devices %}
+    <h3> No claimed devices</h3>
+{% else %}
+<div class="container-fluid">
+    <table border="1" class="table">
+        <thead>
             <tr>
-                <td>{{ device.mac_address }}</td>
-                <td>{{ device.hostname }}</td>
-                <td>
-                    {% if device.run_request %}
-                        {{ device.run_request }}
-                    {% endif %}
-                </td>
-                <td>
-                    {% if device.run_request %}
-                        <form method="POST" action="/portal/devices/runreq/{{ device.mac_address }}/clean/">
-                            {% csrf_token %}
-                            <input type="submit" value="Cancel runrequest">
-                        </form>
-                    {% else %}
-                        <a href="/portal/devices/runreq/{{ device.mac_address }}">Submit provision request</a>
-                    {% endif %}
-                </td>
+                <th>Mac Address</th>
+                <th>Hostname</th>
+                <th>Run Request</th>
+                <th>Actions</th>
+                <th></th>
             </tr>
-        {% endif %}
-    {% endfor %}
-</table>
+        </thead>
+        <tbody>
+            {% for device in devices %}
+                {% has_perm 'zezere.view_device' user device as can_view_device %}
+                {% if can_view_device %}
+                    <tr>
+                        <td class="align-items-center">{{ device.mac_address }}</td>
+                        <td>{{ device.hostname }}</td>
+                        <td>
+                            {% if device.run_request %}
+                                {{ device.run_request }}
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if device.run_request %}
+                                <form method="POST" action="/portal/devices/runreq/{{ device.mac_address }}/clean/">
+                                    {% csrf_token %}
+                                    <input class="btn btn-warning" type="submit" value="Cancel runrequest">
+                                </form>
+                            {% else %}
+                                <a class="btn btn-primary" href="/portal/devices/runreq/{{ device.mac_address }}">Submit provision request</a>
+                            {% endif %}
+                        </td>
+                        <td>
+                            <form method="POST" action="/portal/devices/delete/">
+                                {% csrf_token %}
+                                <input type="hidden" name="device_id" value="{{ device.id }}">
+                                <input class ="btn btn-danger" type="submit" value="Remove Device">
+                            </form>
+                        </td>
+                    </tr>
+                {% endif %}
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% endif %}
 {% endblock %}
diff --git a/zezere/urls.py b/zezere/urls.py
index 370eb4e..62fce52 100644
--- a/zezere/urls.py
+++ b/zezere/urls.py
@@ -22,7 +22,13 @@
     # Portal
     path("portal/", views_portal.index, name="portal_index"),
     path("portal/claim/", views_portal.claim, name="portal_claim"),
+    path("portal/claim/remove/", views_portal.remove_unclaimed, name="portal_remove_unclamed"),
     path("portal/devices/", views_portal.devices, name="portal_devices"),
+    path(
+        "portal/devices/delete/",
+        views_portal.unclaim,
+        name="portal_unclaim_device",
+    ),
     path(
         "portal/devices/runreq/<str:mac_addr>/",
         views_portal.new_runreq,
diff --git a/zezere/views_portal.py b/zezere/views_portal.py
index eaff942..406a7ee 100644
--- a/zezere/views_portal.py
+++ b/zezere/views_portal.py
@@ -37,6 +37,31 @@ def claim(request):
     return render(request, "portal/claim.html", context)
 
 
+@login_required
+@require_POST
+def remove_unclaimed(request):
+    device_id = request.POST.get("device_id")
+    device = get_object_or_404(Device, id=device_id)
+    if not request.user.has_perm(Device.get_perm("remove_unclaimed"), device):
+        raise PermissionDenied()
+
+    device.delete()
+    return redirect("/portal/claim/")
+
+
+@login_required
+@require_POST
+def unclaim(request):
+    device_id = request.POST.get("device_id")
+    device = get_object_or_404(Device, id=device_id)
+    if not request.user.has_perm(Device.get_perm("delete"), device):
+        raise PermissionDenied()
+
+    device.owner = None
+    device.save()
+    return redirect("/portal/devices/")
+
+
 @login_required
 def devices(request):
     devices = Device.objects.filter(owner=request.user)