diff --git a/app/src/main/res/layout/fragment_remotes_item.xml b/app/src/main/res/layout/fragment_remotes_item.xml
index fab3e33a4..390b40c75 100644
--- a/app/src/main/res/layout/fragment_remotes_item.xml
+++ b/app/src/main/res/layout/fragment_remotes_item.xml
@@ -35,12 +35,14 @@
 
             <TextView
                 android:id="@+id/remoteName"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
                 android:fontFamily="sans-serif"
                 android:textAppearance="?attr/textAppearanceListItem"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/pin_icon"
                 app:layout_constraintStart_toEndOf="@id/remoteIcon"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="Google Drive" />
diff --git a/app/src/main/res/layout/fragment_tasks_item.xml b/app/src/main/res/layout/fragment_tasks_item.xml
index 2149b9b30..e0c378a28 100644
--- a/app/src/main/res/layout/fragment_tasks_item.xml
+++ b/app/src/main/res/layout/fragment_tasks_item.xml
@@ -8,7 +8,7 @@
 
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:elevation="4dp"
         android:theme="@style/SecondaryCardStyle"
@@ -17,14 +17,13 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content">
 
             <ImageView
                 android:id="@+id/taskIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
+                android:layout_marginStart="16dp"
                 android:contentDescription="@string/remote_icon"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -33,41 +32,22 @@
 
             <TextView
                 android:id="@+id/taskName"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
+                android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
+                android:layout_marginEnd="8dp"
                 android:fontFamily="sans-serif"
                 android:textSize="16sp"
+                app:layout_constraintEnd_toStartOf="@+id/task_sync_direction"
                 app:layout_constraintStart_toEndOf="@+id/taskIcon"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="Google Drive" />
 
-            <TextView
-                android:id="@+id/fromLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/task_item_label_from"
-                app:layout_constraintStart_toStartOf="@+id/taskName"
-                app:layout_constraintTop_toBottomOf="@+id/taskName" />
-
-            <TextView
-                android:id="@+id/toLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="24dp"
-                android:text="@string/task_item_label_to"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="@+id/fromLabel"
-                app:layout_constraintTop_toBottomOf="@+id/fromLabel" />
-
             <ImageButton
                 android:id="@+id/file_options"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/file_options_content_description"
                 android:minWidth="48dp"
@@ -81,7 +61,7 @@
                 android:id="@+id/task_sync_direction"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="32dp"
+                android:layout_marginEnd="16dp"
                 android:text="@string/sync"
                 android:textSize="12sp"
                 android:textStyle="italic"
@@ -90,69 +70,87 @@
                 app:layout_constraintTop_toTopOf="@+id/taskName" />
 
             <LinearLayout
+                android:id="@+id/pathsContainer"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="16dp"
                 android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="@+id/toLabel"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/file_options"
-                app:layout_constraintStart_toEndOf="@+id/fromLabel"
-                app:layout_constraintTop_toTopOf="@+id/fromLabel">
+                app:layout_constraintStart_toEndOf="@+id/taskIcon"
+                app:layout_constraintTop_toBottomOf="@+id/taskName">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="start"
                     android:orientation="horizontal">
 
                     <TextView
-                        android:id="@+id/fromID"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/fromLabel"
+                        android:layout_width="48dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="2dp"
-                        android:singleLine="true"
-                        android:text="fromid"
-                        android:textColor="@color/textColorHighlight"
-                        android:textStyle="italic"
-                        tools:ignore="HardcodedText" />
+                        android:text="@string/task_item_label_from" />
 
-                    <TextView
-                        android:id="@+id/fromPath"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:text="fromPath"
-                        tools:ignore="HardcodedText" />
-
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/fromID"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/textColorHighlight"
+                            android:textStyle="italic"
+                            tools:text="fromid:" />
+
+                        <TextView
+                            android:id="@+id/fromPath"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            tools:text="fromPath" />
+                    </LinearLayout>
                 </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="start"
+                    android:layout_marginTop="6dp"
                     android:orientation="horizontal">
 
                     <TextView
-                        android:id="@+id/toID"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/toLabel"
+                        android:layout_width="48dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="2dp"
-                        android:singleLine="true"
-                        android:text="toid"
-                        android:textAllCaps="false"
-                        android:textColor="@color/textColorHighlight"
-                        android:textStyle="italic"
-                        tools:ignore="HardcodedText" />
+                        android:text="@string/task_item_label_to" />
 
-                    <TextView
-                        android:id="@+id/toPath"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:text="toPath"
-                        tools:ignore="HardcodedText" />
-
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/toID"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textAllCaps="false"
+                            android:textColor="@color/textColorHighlight"
+                            android:textStyle="italic"
+                            tools:text="toid:" />
+
+                        <TextView
+                            android:id="@+id/toPath"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            tools:text="toPath" />
+                    </LinearLayout>
                 </LinearLayout>
+
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_trigger_item_interval.xml b/app/src/main/res/layout/fragment_trigger_item_interval.xml
index b19dcb94c..aeb3c154f 100644
--- a/app/src/main/res/layout/fragment_trigger_item_interval.xml
+++ b/app/src/main/res/layout/fragment_trigger_item_interval.xml
@@ -34,12 +34,14 @@
 
             <TextView
                 android:id="@+id/triggerName"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
                 android:fontFamily="sans-serif"
                 android:textSize="16sp"
+                app:layout_constraintEnd_toStartOf="@+id/triggerOptions"
                 app:layout_constraintStart_toEndOf="@+id/triggerIcon"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="Triggername" />
@@ -59,7 +61,7 @@
 
             <TextView
                 android:id="@+id/intervalLabel"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:layout_marginBottom="8dp"
@@ -72,18 +74,21 @@
                 android:id="@+id/trigger_target_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
+                android:layout_marginStart="16dp"
                 android:text="@string/trigger_task_label"
                 app:layout_constraintStart_toEndOf="@+id/intervalLabel"
                 app:layout_constraintTop_toTopOf="@+id/intervalLabel" />
 
             <TextView
                 android:id="@+id/trigger_target"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                app:layout_constraintEnd_toStartOf="@+id/triggerOptions"
                 app:layout_constraintStart_toEndOf="@+id/trigger_target_label"
-                app:layout_constraintTop_toTopOf="@+id/trigger_target_label" />
+                app:layout_constraintTop_toTopOf="@+id/trigger_target_label"
+                tools:text="Target Task" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/fragment_trigger_item_schedule.xml b/app/src/main/res/layout/fragment_trigger_item_schedule.xml
index f23e65ff1..59de84afd 100644
--- a/app/src/main/res/layout/fragment_trigger_item_schedule.xml
+++ b/app/src/main/res/layout/fragment_trigger_item_schedule.xml
@@ -8,7 +8,7 @@
 
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:elevation="4dp"
         android:theme="@style/SecondaryCardStyle"
@@ -18,8 +18,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content">
 
             <ImageButton
                 android:id="@+id/triggerIcon"
@@ -34,12 +33,14 @@
 
             <TextView
                 android:id="@+id/triggerName"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
                 android:fontFamily="sans-serif"
                 android:textSize="16sp"
+                app:layout_constraintEnd_toStartOf="@+id/triggerOptions"
                 app:layout_constraintStart_toEndOf="@+id/triggerIcon"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="Triggername" />
@@ -48,8 +49,6 @@
                 android:id="@+id/triggerOptions"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/file_options_content_description"
                 android:padding="4dp"
@@ -62,99 +61,116 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:layout_marginBottom="8dp"
                 android:text="@string/trigger_time_label"
-                app:layout_constraintBottom_toTopOf="@+id/linearLayout"
                 app:layout_constraintStart_toStartOf="@+id/triggerName"
                 app:layout_constraintTop_toBottomOf="@+id/triggerName" />
 
             <TextView
                 android:id="@+id/intervalLabel"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 app:layout_constraintStart_toEndOf="@+id/text_label_time"
-                app:layout_constraintTop_toTopOf="@+id/text_label_time" />
+                app:layout_constraintTop_toTopOf="@+id/text_label_time"
+                tools:text="04:00" />
+
+            <TextView
+                android:id="@+id/trigger_target_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/trigger_task_label"
+                app:layout_constraintStart_toStartOf="@+id/text_label_time"
+                app:layout_constraintTop_toBottomOf="@+id/text_label_time" />
+
+            <TextView
+                android:id="@+id/trigger_target"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                app:layout_constraintEnd_toStartOf="@+id/triggerOptions"
+                app:layout_constraintStart_toEndOf="@+id/trigger_target_label"
+                app:layout_constraintTop_toTopOf="@+id/trigger_target_label"
+                tools:text="Backup task name" />
 
             <LinearLayout
                 android:id="@+id/linearLayout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="64dp"
-                android:layout_marginEnd="64dp"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="16dp"
                 android:layout_marginBottom="8dp"
                 android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent">
+                app:layout_constraintStart_toStartOf="@+id/text_label_time"
+                app:layout_constraintTop_toBottomOf="@+id/trigger_target">
 
                 <TextView
                     android:id="@+id/trigger_enabled_mon"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:gravity="center"
+                    android:singleLine="true"
                     android:text="@string/weekday_shorthand_mon" />
 
                 <TextView
                     android:id="@+id/trigger_enabled_tue"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/weekday_shorthand_tue"/>
+                    android:gravity="center"
+                    android:singleLine="true"
+                    android:text="@string/weekday_shorthand_tue" />
 
                 <TextView
                     android:id="@+id/trigger_enabled_wed"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:gravity="center"
+                    android:singleLine="true"
                     android:text="@string/weekday_shorthand_wed" />
 
                 <TextView
                     android:id="@+id/trigger_enabled_thu"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:gravity="center"
+                    android:singleLine="true"
                     android:text="@string/weekday_shorthand_thur" />
 
                 <TextView
                     android:id="@+id/trigger_enabled_fri"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:gravity="center"
+                    android:singleLine="true"
                     android:text="@string/weekday_shorthand_fri" />
 
                 <TextView
                     android:id="@+id/trigger_enabled_sat"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:gravity="center"
+                    android:singleLine="true"
                     android:text="@string/weekday_shorthand_sat" />
 
                 <TextView
                     android:id="@+id/trigger_enabled_sun"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:gravity="center"
+                    android:singleLine="true"
                     android:text="@string/weekday_shorthand_sun" />
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/trigger_target_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:text="@string/trigger_task_label"
-                app:layout_constraintStart_toEndOf="@+id/intervalLabel"
-                app:layout_constraintTop_toTopOf="@+id/intervalLabel" />
-
-            <TextView
-                android:id="@+id/trigger_target"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                app:layout_constraintStart_toEndOf="@+id/trigger_target_label"
-                app:layout_constraintTop_toTopOf="@+id/trigger_target_label" />
-
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>