diff --git a/fet2020/templates/finance/bill_create.html b/fet2020/templates/finance/bill_create.html
index e5d6723d..144914f2 100644
--- a/fet2020/templates/finance/bill_create.html
+++ b/fet2020/templates/finance/bill_create.html
@@ -38,7 +38,7 @@
             <small>Details zur ursprünglichen bereits bezahlten Rechnung angeben.</small>
 
             <div class="grid grid-cols-1 gap-x-6 gap-y-6 sm:grid-cols-6">
-                <div class="sm:col-span-4">
+                <div class="col-span-full">
                     {% include "baseform/textarea.html" with field=form.invoice %}
                 </div>
                 <div class="col-span-full">
@@ -59,7 +59,8 @@
                             type="number"
                             name="amount"
                             value={{ form.amount.value }}
-                            required
+                            {% if form.amount.field.required %}required{% endif %}
+                            {% if form.amount.field.disabled %}disabled{% endif %}
                             min="0.00"
                             step="0.01"
                             placeholder="123,99"
diff --git a/fet2020/templates/finance/bill_update.html b/fet2020/templates/finance/bill_update.html
index bc8f47b0..0778341d 100644
--- a/fet2020/templates/finance/bill_update.html
+++ b/fet2020/templates/finance/bill_update.html
@@ -60,7 +60,7 @@
             <small>Details zur ursprünglichen bereits bezahlten Rechnung angeben.</small>
 
             <div class="grid grid-cols-1 gap-x-6 gap-y-6 sm:grid-cols-6">
-                <div class="sm:col-span-4">
+                <div class="col-span-full">
                     {% include "baseform/textarea.html" with field=form.invoice %}
                 </div>
                 <div class="col-span-full">
diff --git a/fet2020/templates/rental/calendar.html b/fet2020/templates/rental/calendar.html
index e10e60c5..fc419036 100644
--- a/fet2020/templates/rental/calendar.html
+++ b/fet2020/templates/rental/calendar.html
@@ -143,11 +143,12 @@
                       {% for name in names %}
                         <div class="bottom h-30 py-1 w-full">
                           <div class="event bg-purple-400 text-white rounded p-1 text-sm">
-                            <span class="event-name xl:block lg:hidden md:hidden sm:hidden hidden">{{ name }}</span>
-                            <span class="event-name xl:hidden lg:block md:hidden sm:hidden hidden">{{ name|truncatechars:15 }}</span>            
-                            <span class="event-name xl:hidden lg:hidden md:block sm:hidden hidden">{{ name|truncatechars:10 }}</span>            
-                            <span class="event-name xl:hidden lg:hidden md:hidden sm:block hidden">{{ name|truncatechars:6 }}</span>            
-                            <span class="event-name xl:hidden lg:hidden md:hidden sm:hidden block">{{ name|truncatechars:3 }}</span>            
+                            <span class="event-name whitespace-nowrap 2xl:block xl:hidden lg:hidden md:hidden sm:hidden hidden">{{ name|truncatechars:26 }}</span>
+                            <span class="event-name whitespace-nowrap 2xl:hidden xl:block lg:hidden md:hidden sm:hidden hidden">{{ name|truncatechars:20 }}</span>
+                            <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:block md:hidden sm:hidden hidden">{{ name|truncatechars:15 }}</span>            
+                            <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:block sm:hidden hidden">{{ name|truncatechars:10 }}</span>            
+                            <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:hidden sm:block hidden">{{ name|truncatechars:6 }}</span>            
+                            <span class="event-name whitespace-nowrap 2xl:hidden xl:hidden lg:hidden md:hidden sm:hidden block">{{ name|truncatechars:3 }}</span>            
                           </div>
                         </div>
                         {% empty %}