diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/ObserveSourcesViewModel.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/ObserveSourcesViewModel.kt
index 5d07cd3d..00eb6c46 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/ObserveSourcesViewModel.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/ObserveSourcesViewModel.kt
@@ -63,10 +63,15 @@ class ObserveSourcesViewModel(private val application: Application) : AndroidVie
     }
 
     fun delete(item: ObserveSourcesItem) = viewModelScope.launch(Dispatchers.IO) {
+        runCatching { DownloadUtil.cancelObservationTaskByID(application, item.id) }
         repository.delete(item)
     }
 
     fun deleteAll() = viewModelScope.launch(Dispatchers.IO) {
+        getAll().forEach {
+            runCatching { DownloadUtil.cancelObservationTaskByID(application, it.id) }
+        }
+
         repository.deleteAll()
     }
 
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/work/ObserveSourceWorker.kt b/app/src/main/java/com/deniscerri/ytdlnis/work/ObserveSourceWorker.kt
index 708f88e4..17f926a8 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/work/ObserveSourceWorker.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/work/ObserveSourceWorker.kt
@@ -83,6 +83,11 @@ class ObserveSourceWorker(
             items.add(downloadItem)
         }
 
+        withContext(Dispatchers.IO){
+            repo.update(item)
+        }
+
+
         if (items.isNotEmpty()){
 
             //QUEUE DOWNLOADS
@@ -149,7 +154,7 @@ class ObserveSourceWorker(
                 DownloadUtil.startDownloadWorker(queuedItems, context)
 
                 if(!useScheduler){
-                    queuedItems.filter { it.downloadStartTime != 0L && (it.title.isEmpty() || it.author.isEmpty() || it.thumb.isEmpty()) }.forEach {
+                    queuedItems.filter { it.downloadStartTime != 0L || (it.title.isEmpty() || it.author.isEmpty() || it.thumb.isEmpty()) }.forEach {
                         try{
                             updateDownloadItem(it, infoUtil, downloadRepo, dbManager.resultDao)
                         }catch (ignored: Exception){}
@@ -166,7 +171,6 @@ class ObserveSourceWorker(
             item.alreadyProcessedLinks.addAll(items.map { it.url })
         }
 
-
         if (item.runCount > item.endsAfterCount && item.endsAfterCount > 0){
             item.status = ObserveSourcesRepository.SourceStatus.STOPPED
             withContext(Dispatchers.IO){
diff --git a/app/src/main/res/layout/observe_sources_bottom_sheet.xml b/app/src/main/res/layout/observe_sources_bottom_sheet.xml
index d0037f47..69d46d66 100644
--- a/app/src/main/res/layout/observe_sources_bottom_sheet.xml
+++ b/app/src/main/res/layout/observe_sources_bottom_sheet.xml
@@ -394,20 +394,23 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="10dp"
+                    android:weightSum="5"
                     android:orientation="horizontal">
 
                     <RadioButton
                         android:id="@+id/on"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="@string/on"
+                        android:text="@string/on_time"
+                        android:layout_weight="2"
                         android:paddingHorizontal="10dp" />
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/on_date"
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         app:hintEnabled="false"
+                        android:layout_weight="3"
                         android:layout_marginStart="15dp"
                         style="@style/Widget.Material3.TextInputLayout.FilledBox">
 
@@ -425,18 +428,22 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:weightSum="7"
                     android:orientation="horizontal">
 
                     <RadioButton
                         android:id="@+id/after"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
+                        android:layout_weight="3"
                         android:layout_height="wrap_content"
+                        android:layout_marginEnd="-4dp"
                         android:text="@string/after"
                         android:paddingHorizontal="10dp" />
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/after_nr"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="match_parent"
                         style="@style/Widget.Material3.TextInputLayout.FilledBox.Dense">
 
@@ -452,7 +459,8 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <TextView
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="2"
                         android:layout_height="wrap_content"
                         android:paddingHorizontal="10dp"
                         android:text="@string/occurrences"/>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index ccf3e5ff..24372501 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -334,7 +334,7 @@
     <string name="starts">Mulai</string>
     <string name="ends">Berakhir</string>
     <string name="never">Jangan pernah</string>
-    <string name="on">Pada</string>
+    <string name="on_time">Pada</string>
     <string name="after">Setelah</string>
     <string name="occurrences">kali</string>
     <string name="week">Pekan</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 233c537e..2f9997e4 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -342,7 +342,7 @@
     <string name="ends">Termina</string>
     <string name="never">Nunca</string>
     <string name="after">Depois</string>
-    <string name="on">Habilitar</string>
+    <string name="on_time">Habilitar</string>
     <string name="week">Semana</string>
     <string name="month">Mês</string>
     <string name="bitrate">Taxa de bits</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 992a446f..df383ad1 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -356,7 +356,7 @@
     <string name="day">Dia</string>
     <string name="month">Mês</string>
     <string name="set_time">Definir tempo</string>
-    <string name="on">Ligado</string>
+    <string name="on_time">Ligado</string>
     <string name="download_archive">Arquivo de descarga</string>
     <string name="download_archive_summary">Use o arquivo de descarga do yt-dlp para evitar descargas duplicados em vez da funcionalidade integrada</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 619e3e6f..6e86c7b1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -343,7 +343,7 @@
     <string name="set_time">Установить время</string>
     <string name="never">Никогда</string>
     <string name="starts">Начинается</string>
-    <string name="on">Вкл</string>
+    <string name="on_time">Вкл</string>
     <string name="day">День</string>
     <string name="occurrences">случаи</string>
     <string name="download_archive_summary">Используйте архивный файл загрузок yt-dlp, чтобы предотвратить дублирование загрузок вместо встроенной функции</string>
diff --git a/app/src/main/res/values-sq-rAL/strings.xml b/app/src/main/res/values-sq-rAL/strings.xml
index b6661067..3663d145 100644
--- a/app/src/main/res/values-sq-rAL/strings.xml
+++ b/app/src/main/res/values-sq-rAL/strings.xml
@@ -340,7 +340,7 @@
     <string name="copy_urls">Kopjo URL\'të</string>
     <string name="starts">Fillon</string>
     <string name="never">Kurrë</string>
-    <string name="on">Në</string>
+    <string name="on_time">Në</string>
     <string name="after">Pas</string>
     <string name="occurrences">herësh</string>
     <string name="week">Javë</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index eb30af39..65db78c3 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -343,7 +343,7 @@
     <string name="set_time">Встановити час</string>
     <string name="ends">Закінчується</string>
     <string name="never">Ніколи</string>
-    <string name="on">Вкл</string>
+    <string name="on_time">Вкл</string>
     <string name="after">Після</string>
     <string name="day">День</string>
     <string name="week">Тиждень</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a0032031..044bab54 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -350,7 +350,7 @@
     <string name="starts">Starts</string>
     <string name="ends">Ends</string>
     <string name="never">Never</string>
-    <string name="on">On</string>
+    <string name="on_time">On</string>
     <string name="after">After</string>
     <string name="occurrences">occurrences</string>
     <string name="day">Day</string>