diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2ea0a4d39..2f88ecc82 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mainContainer"
     android:layout_width="match_parent"
@@ -10,18 +10,19 @@
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:contentInsetStartWithNavigation="0dp" />
+        app:contentInsetStartWithNavigation="0dp"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/mainFragmentContainer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?actionBarSize"
-        android:layout_marginBottom="@dimen/bottom_navigation_height" />
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/mainBottomNav"
+        app:layout_constraintTop_toBottomOf="@id/mainToolbar" />
 
     <com.aurelhubert.ahbottomnavigation.AHBottomNavigation
         android:id="@+id/mainBottomNav"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_about.xml b/app/src/main/res/layout/item_about.xml
index f988c47ba..6a95e5529 100644
--- a/app/src/main/res/layout/item_about.xml
+++ b/app/src/main/res/layout/item_about.xml
@@ -33,7 +33,8 @@
     <TextView
         android:id="@+id/aboutItemSummary"
         android:layout_width="wrap_content"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
+        android:minHeight="20dp"
         android:layout_below="@id/aboutItemTitle"
         android:layout_marginEnd="16dp"
         android:layout_toEndOf="@id/aboutItemImage"
diff --git a/app/src/main/res/layout/item_attendance.xml b/app/src/main/res/layout/item_attendance.xml
index 6917c6ce0..e25b51f69 100644
--- a/app/src/main/res/layout/item_attendance.xml
+++ b/app/src/main/res/layout/item_attendance.xml
@@ -1,4 +1,4 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/attendanceItemContainer"
@@ -15,10 +15,17 @@
 
     <LinearLayout
         android:id="@+id/attendanceItemNumberContainer"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="40dp"
+        android:minHeight="40dp"
         android:gravity="center"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="@+id/attendanceItemDetailsContainer"
+        app:layout_constraintEnd_toStartOf="@+id/attendanceItemDetailsContainer"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/attendanceItemDetailsContainer">
 
         <TextView
             android:id="@+id/attendanceItemNumber"
@@ -48,38 +55,52 @@
             app:tint="?attr/colorOnSurface" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/attendanceItemSubject"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/attendanceItemDetailsContainer"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
-        android:layout_marginEnd="40dp"
-        android:layout_toStartOf="@id/attendanceItemAlert"
-        android:layout_toEndOf="@+id/attendanceItemNumberContainer"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textSize="17sp"
-        tools:text="Matematyka" />
+        android:layout_marginEnd="10dp"
+        app:layout_constraintEnd_toStartOf="@+id/attendanceItemAlert"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/attendanceItemNumberContainer"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/attendanceItemDescription"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@id/attendanceItemSubject"
-        android:layout_alignBottom="@+id/attendanceItemNumberContainer"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        tools:text="Present" />
+        <TextView
+            android:id="@+id/attendanceItemSubject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="17sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Matematyka" />
+
+        <TextView
+            android:id="@+id/attendanceItemDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="@id/attendanceItemDetailsContainer"
+            app:layout_constraintStart_toStartOf="@id/attendanceItemDetailsContainer"
+            app:layout_constraintTop_toBottomOf="@id/attendanceItemSubject"
+            tools:text="Present" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <ImageView
         android:id="@+id/attendanceItemAlert"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="10dp"
+        app:layout_constraintBottom_toBottomOf="@+id/attendanceItemDetailsContainer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/attendanceItemDetailsContainer"
+        app:layout_constraintTop_toTopOf="@+id/attendanceItemDetailsContainer"
         app:srcCompat="@drawable/ic_all_mark"
         app:tint="?colorPrimary"
         tools:ignore="contentDescription" />
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_attendance_summary_subject.xml b/app/src/main/res/layout/item_attendance_summary_subject.xml
index 263c08a73..ff731461d 100644
--- a/app/src/main/res/layout/item_attendance_summary_subject.xml
+++ b/app/src/main/res/layout/item_attendance_summary_subject.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/attendanceSummaryItemSubject"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="wrap_content"
+    android:minHeight="48dp"
     android:gravity="start"
     android:maxLines="1"
     android:paddingLeft="16dp"
diff --git a/app/src/main/res/layout/item_completed_lesson.xml b/app/src/main/res/layout/item_completed_lesson.xml
index b9beec804..e9944f56f 100644
--- a/app/src/main/res/layout/item_completed_lesson.xml
+++ b/app/src/main/res/layout/item_completed_lesson.xml
@@ -12,8 +12,11 @@
 
     <TextView
         android:id="@+id/completedLessonItemNumber"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:minWidth="40dp"
+        android:minHeight="40dp"
         android:layout_centerVertical="true"
         android:gravity="center"
         android:includeFontPadding="false"
@@ -40,9 +43,9 @@
         android:id="@+id/completedLessonItemTopic"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/completedLessonItemSubject"
         android:layout_alignStart="@id/completedLessonItemSubject"
         android:layout_alignEnd="@+id/completedLessonItemAlert"
-        android:layout_alignBottom="@+id/completedLessonItemNumber"
         android:layout_marginEnd="40dp"
         android:ellipsize="end"
         android:maxLines="1"
@@ -56,7 +59,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:tint="?colorTimetableChange"
         app:srcCompat="@drawable/ic_timetable_swap"
+        app:tint="?colorTimetableChange"
         tools:ignore="contentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_grade_details.xml b/app/src/main/res/layout/item_grade_details.xml
index ccc968c08..2f3bd2de5 100644
--- a/app/src/main/res/layout/item_grade_details.xml
+++ b/app/src/main/res/layout/item_grade_details.xml
@@ -18,62 +18,82 @@
 
         <TextView
             android:id="@+id/gradeItemValue"
-            android:layout_width="45dp"
-            android:layout_height="40dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:background="@color/grade_material_default"
             android:gravity="center"
             android:maxLength="5"
+            android:minWidth="45dp"
+            android:minHeight="40dp"
             android:textColor="@android:color/white"
             android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="@+id/gradeDetailsContainer"
+            app:layout_constraintEnd_toStartOf="@+id/gradeDetailsContainer"
+            app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/gradeDetailsContainer"
             tools:text="6" />
 
-        <TextView
-            android:id="@+id/gradeItemDescription"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/gradeDetailsContainer"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="20dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textSize="14sp"
-            app:layout_constraintEnd_toStartOf="@id/gradeItemNote"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/gradeItemNote"
+            app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/gradeItemValue"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/lorem" />
+            app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/gradeItemDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="@+id/gradeItemValue"
-            app:layout_constraintStart_toStartOf="@+id/gradeItemDescription"
-            tools:text="@tools:sample/date/ddmmyy" />
+            <TextView
+                android:id="@+id/gradeItemDescription"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="20dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="@id/gradeDetailsContainer"
+                app:layout_constraintStart_toStartOf="@id/gradeDetailsContainer"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="@tools:sample/lorem" />
 
-        <TextView
-            android:id="@+id/gradeItemWeight"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="20dp"
-            android:maxLines="1"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="@+id/gradeItemValue"
-            app:layout_constraintEnd_toStartOf="@id/gradeItemNote"
-            app:layout_constraintStart_toEndOf="@+id/gradeItemDate"
-            tools:text="@tools:sample/lorem" />
+            <TextView
+                android:id="@+id/gradeItemDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:textSize="12sp"
+                app:layout_constraintBottom_toBottomOf="@+id/gradeDetailsContainer"
+                app:layout_constraintStart_toStartOf="@+id/gradeItemDescription"
+                app:layout_constraintTop_toBottomOf="@+id/gradeItemDescription"
+                tools:text="@tools:sample/date/ddmmyy" />
+
+            <TextView
+                android:id="@+id/gradeItemWeight"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="20dp"
+                android:maxLines="1"
+                android:textSize="12sp"
+                app:layout_constraintBottom_toBottomOf="@+id/gradeDetailsContainer"
+                app:layout_constraintEnd_toEndOf="@id/gradeDetailsContainer"
+                app:layout_constraintStart_toEndOf="@+id/gradeItemDate"
+                app:layout_constraintTop_toBottomOf="@+id/gradeItemDescription"
+                tools:text="@tools:sample/lorem" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <ImageView
             android:id="@+id/gradeItemNote"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            app:layout_constraintBottom_toBottomOf="@+id/gradeDetailsContainer"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/gradeDetailsContainer"
+            app:layout_constraintTop_toTopOf="@+id/gradeDetailsContainer"
             app:srcCompat="@drawable/ic_all_round_mark"
             app:tint="?colorPrimary"
             tools:ignore="contentDescription" />
diff --git a/app/src/main/res/layout/item_license.xml b/app/src/main/res/layout/item_license.xml
index aaa7cd349..cb55ab87a 100644
--- a/app/src/main/res/layout/item_license.xml
+++ b/app/src/main/res/layout/item_license.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="64dp"
+    android:layout_height="wrap_content"
+    android:minHeight="64dp"
     android:background="?selectableItemBackground"
     android:orientation="vertical"
     android:paddingStart="16dp"
@@ -14,7 +15,8 @@
     <TextView
         android:id="@+id/licenseItemName"
         android:layout_width="match_parent"
-        android:layout_height="28dp"
+        android:layout_height="wrap_content"
+        android:minHeight="28dp"
         android:ellipsize="end"
         android:gravity="bottom"
         android:singleLine="true"
@@ -24,7 +26,8 @@
     <TextView
         android:id="@+id/licenseItemSummary"
         android:layout_width="match_parent"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
+        android:minHeight="20dp"
         android:gravity="bottom"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
diff --git a/app/src/main/res/layout/item_login_student_select.xml b/app/src/main/res/layout/item_login_student_select.xml
index 04858196c..1003636fc 100644
--- a/app/src/main/res/layout/item_login_student_select.xml
+++ b/app/src/main/res/layout/item_login_student_select.xml
@@ -48,7 +48,8 @@
     <TextView
         android:id="@+id/loginItemSignedIn"
         android:layout_width="wrap_content"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
+        android:minHeight="20dp"
         android:layout_below="@id/loginItemSchool"
         android:layout_marginEnd="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
diff --git a/app/src/main/res/layout/item_mobile_device.xml b/app/src/main/res/layout/item_mobile_device.xml
index 3f3d0a751..f49c62f38 100644
--- a/app/src/main/res/layout/item_mobile_device.xml
+++ b/app/src/main/res/layout/item_mobile_device.xml
@@ -3,25 +3,30 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mobileDevice_subitem_container"
     android:layout_width="match_parent"
-    android:layout_height="64dp"
+    android:layout_height="wrap_content"
+    android:minHeight="64dp"
     tools:context=".ui.modules.mobiledevice.MobileDeviceAdapter">
 
     <TextView
         android:id="@+id/mobileDeviceItemName"
         android:layout_width="match_parent"
-        android:layout_height="32dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="0dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
+        android:minHeight="32dp"
         android:textSize="16sp"
         tools:text="@tools:sample/lorem/random" />
 
     <TextView
         android:id="@+id/mobileDeviceItemDate"
         android:layout_width="match_parent"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
+        android:minHeight="20dp"
         android:layout_below="@id/mobileDeviceItemName"
         android:layout_marginStart="16dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index ccef6e72d..7a90d5e74 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -13,8 +13,10 @@
 
     <TextView
         android:id="@+id/timetableItemNumber"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="40dp"
+        android:minHeight="40dp"
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLength="2"
diff --git a/app/src/main/res/layout/item_timetable_small.xml b/app/src/main/res/layout/item_timetable_small.xml
index 98a213ec3..037c10d5d 100644
--- a/app/src/main/res/layout/item_timetable_small.xml
+++ b/app/src/main/res/layout/item_timetable_small.xml
@@ -7,7 +7,8 @@
 
     <TextView
         android:id="@+id/timetableSmallItemNumber"
-        android:layout_width="40dp"
+        android:layout_width="wrap_content"
+        android:minWidth="40dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:gravity="center"
diff --git a/app/src/main/res/layout/item_widget_timetable_dark.xml b/app/src/main/res/layout/item_widget_timetable_dark.xml
index 3dfc3f548..34535c694 100644
--- a/app/src/main/res/layout/item_widget_timetable_dark.xml
+++ b/app/src/main/res/layout/item_widget_timetable_dark.xml
@@ -19,8 +19,10 @@
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="40dp"
+            android:minHeight="40dp"
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLength="2"
diff --git a/app/src/main/res/layout/item_widget_timetable_small.xml b/app/src/main/res/layout/item_widget_timetable_small.xml
index 3a3a2d658..36a6bbddf 100644
--- a/app/src/main/res/layout/item_widget_timetable_small.xml
+++ b/app/src/main/res/layout/item_widget_timetable_small.xml
@@ -16,7 +16,8 @@
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="40dp"
+            android:layout_width="wrap_content"
+            android:minWidth="40dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:maxLength="2"
diff --git a/app/src/main/res/layout/item_widget_timetable_small_dark.xml b/app/src/main/res/layout/item_widget_timetable_small_dark.xml
index 0cc297091..a02d85850 100644
--- a/app/src/main/res/layout/item_widget_timetable_small_dark.xml
+++ b/app/src/main/res/layout/item_widget_timetable_small_dark.xml
@@ -16,7 +16,8 @@
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="40dp"
+            android:layout_width="wrap_content"
+            android:minWidth="40dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:maxLength="2"
@@ -29,7 +30,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
-            android:layout_marginLeft="6dp"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -46,7 +46,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@android:color/white"
@@ -58,7 +57,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="15sp"
@@ -69,7 +67,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/scrollable_header_about.xml b/app/src/main/res/layout/scrollable_header_about.xml
index 72186bf79..e203d98d4 100644
--- a/app/src/main/res/layout/scrollable_header_about.xml
+++ b/app/src/main/res/layout/scrollable_header_about.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="104dp"
+    android:layout_height="wrap_content"
+    android:minHeight="104dp"
     android:orientation="vertical"
     tools:context=".ui.modules.about.AboutAdapter">