diff --git a/app/build.gradle b/app/build.gradle
index 4bd997d..251cd2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,7 @@ android {
             keyPassword secretProperties['signing_key_password']
         }
     }
-    compileSdkVersion 29
+    compileSdk 31
 
     defaultConfig {
         applicationId "net.foucry.pilldroid"
diff --git a/app/src/main/res/layout/drug_list.xml b/app/src/main/res/layout/drug_list.xml
index 928091c..d798d15 100644
--- a/app/src/main/res/layout/drug_list.xml
+++ b/app/src/main/res/layout/drug_list.xml
@@ -6,7 +6,6 @@
     android:name="net.foucry.pilldroid.MedicamentListFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     app:layoutManager="LinearLayoutManager"
     android:background="@drawable/list_selector"
     tools:context="net.foucry.pilldroid.DrugListActivity"
diff --git a/app/src/main/res/layout/drug_list_content.xml b/app/src/main/res/layout/drug_list_content.xml
index b197ff1..93a2b46 100644
--- a/app/src/main/res/layout/drug_list_content.xml
+++ b/app/src/main/res/layout/drug_list_content.xml
@@ -36,15 +36,15 @@
             android:id="@+id/endOfStock"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginEnd="30dp"
+            android:layout_marginBottom="5dp"
             android:gravity="end"
             android:text="@string/Date"
-            android:textSize="14sp"
             android:textColor="#212121"
-            android:textStyle="bold"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="30dp"
-            android:layout_marginBottom="5dp" />
+            android:textSize="14sp"
+            android:textStyle="bold" />
     </RelativeLayout>
 
     <!-- CIP 13 (should change) -->