diff --git a/rentals/templates/rentals/lockers.dj.html b/rentals/templates/rentals/lockers.dj.html
index efd50af..606dd11 100644
--- a/rentals/templates/rentals/lockers.dj.html
+++ b/rentals/templates/rentals/lockers.dj.html
@@ -31,7 +31,6 @@
     background-color: hsl(24, 100%, 25%);
     border: 0.2rem solid black;
     border-radius: 0.5rem;
-    width: 7rem;
     aspect-ratio: 1;
     display: flex;
     flex-direction: column;
@@ -50,7 +49,7 @@
       <div class="lockers">
         {% for unit, lockers in units.items %}
           <div class="locker"
-               style="grid-template-columns: repeat({{ unit.columns }}, min-content);">
+               style="grid-template-columns: repeat({{ unit.columns }}, minmax(7rem, 8.5rem));">
             {% for locker_form in lockers %}
               <div class="dropdown"
                    style="grid-row-start: {{ locker_form.instance.row|add:"1" }}; grid-column-start: {{ locker_form.instance.column|add:"
@@ -65,7 +64,7 @@
                   <div class="locker-status text-wrap">
                     {% if locker_form.instance.renter is not None %}
                       {% if perms.rentals.view_lockerinfo %}
-                        {{ locker_form.instance.renter|truncatechars:15 }}
+                        {{ locker_form.instance.renter }}
                       {% else %}
                         Occupied
                       {% endif %}