diff --git a/rentals/templates/rentals/lockers.dj.html b/rentals/templates/rentals/lockers.dj.html
index 152a9cb..90b13a4 100644
--- a/rentals/templates/rentals/lockers.dj.html
+++ b/rentals/templates/rentals/lockers.dj.html
@@ -60,11 +60,11 @@
                       aria-haspopup="true"
                       aria-expanded="false"
                       data-rented="{{ locker_form.instance.renter|yesno:"true,false" }}">
-                  <h3 class="locker-address">{{ locker_form.instance.address }}</h3>
-                  <div class="locker-status">
+                  <h3 class="locker-address mb-0">{{ locker_form.instance.address }}</h3>
+                  <div class="locker-status text-wrap">
                     {% if locker_form.instance.renter is not None %}
                       {% if perms.rentals.view_lockerinfo %}
-                        {{ locker_form.instance.renter }}
+                        {{ locker_form.instance.renter|truncatechars:15 }}
                       {% else %}
                         Occupied
                       {% endif %}