diff --git a/res/layout/activity_updates.xml b/res/layout/activity_updates.xml
index 9f243b19a3c47c31fd0690ced6fe594b5d677316..76497f33cad3327bdd7d7fd36cf12ad08bf4b9d9 100644
--- a/res/layout/activity_updates.xml
+++ b/res/layout/activity_updates.xml
@@ -34,12 +34,22 @@
                 android:paddingStart="16dp"
                 app:layout_collapseMode="parallax">
 
+                <TextView
+                    android:id="@+id/header_current_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="24dp"
+                    android:text="@string/current_version"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textSize="16sp" />
+
                 <TextView
                     android:id="@+id/header_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="sans-serif-light"
-                    android:paddingBottom="16dp"
+                    android:paddingBottom="24dp"
+                    android:layout_below="@id/header_current_version"
                     android:textColor="?android:attr/textColorPrimary"
                     android:textSize="30sp" />
 
@@ -64,7 +74,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/header_build_date"
-                    android:layout_marginTop="8dp"
                     android:textColor="?android:attr/textColorPrimary"
                     android:textSize="12sp" />
             </RelativeLayout>
@@ -93,12 +102,32 @@
             android:textColor="?android:textColorSecondary" />
     </androidx.core.widget.NestedScrollView>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
+    <LinearLayout
+        android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:paddingBottom="5dp"
-        android:scrollbars="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        android:orientation="vertical" 
+        android:visibility="gone"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <TextView
+            android:id="@+id/available_update_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="24dp"
+            android:paddingBottom="24dp"
+            android:paddingStart="16dp"
+            android:textSize="16sp"
+            android:background="?attr/colorPrimary"
+            android:text="@string/available_updates"
+            android:textColor="?android:textColorPrimary" />
+        
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:paddingBottom="5dp"
+            android:scrollbars="vertical" />
+    </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index e9b207f6e0da5d75b162bd7ada7830f28e149d8b..31516d91fef799245046e34c834e86036d3463a6 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -70,7 +70,7 @@
     <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>
     <string name="list_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>) • <xliff:g id="percentage" example="56">%4$s</xliff:g></string>
     <string name="list_verifying_update">Verifying update</string>
-    <string name="list_no_updates">No new updates found. To manually check for new updates, use the Refresh button.</string>
+    <string name="list_no_updates">You are running the latest /e/OS version. To manually check for updates, use the Refresh button.</string>
     <string name="action_download">Download</string>
     <string name="action_pause">Pause</string>
     <string name="action_resume">Resume</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 582f39650a561fdefcb9a0817568fdcfb43273f8..acc979b85035597be50e45bbcea4288b845d3ffb 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -70,7 +70,7 @@
     <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>
     <string name="list_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>) • <xliff:g id="percentage" example="56">%4$s</xliff:g></string>
     <string name="list_verifying_update">Verifying update</string>
-    <string name="list_no_updates">No new updates found. To manually check for new updates, use the Refresh button.</string>
+    <string name="list_no_updates">You are running the latest /e/OS version. To manually check for updates, use the Refresh button.</string>
     <string name="action_download">Download</string>
     <string name="action_pause">Pause</string>
     <string name="action_resume">Resume</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 9ca4fc730a8bdbc6a23c33543efe48705015ef4d..f2f747f09c32453e0ce82508d5dbb37d7c73b05c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -70,7 +70,7 @@
     <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>
     <string name="list_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>) • <xliff:g id="percentage" example="56">%4$s</xliff:g></string>
     <string name="list_verifying_update">Verifying update</string>
-    <string name="list_no_updates">No new updates found. To manually check for new updates, use the Refresh button.</string>
+    <string name="list_no_updates">You are running the latest /e/OS version. To manually check for updates, use the Refresh button.</string>
     <string name="action_download">Download</string>
     <string name="action_pause">Pause</string>
     <string name="action_resume">Resume</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 9ca4fc730a8bdbc6a23c33543efe48705015ef4d..f2f747f09c32453e0ce82508d5dbb37d7c73b05c 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -70,7 +70,7 @@
     <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>
     <string name="list_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>) • <xliff:g id="percentage" example="56">%4$s</xliff:g></string>
     <string name="list_verifying_update">Verifying update</string>
-    <string name="list_no_updates">No new updates found. To manually check for new updates, use the Refresh button.</string>
+    <string name="list_no_updates">You are running the latest /e/OS version. To manually check for updates, use the Refresh button.</string>
     <string name="action_download">Download</string>
     <string name="action_pause">Pause</string>
     <string name="action_resume">Resume</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cb870f67f3b4ec33073dfa7cbae587e97a122947..e41995b3affa5100d7fc7fe40ca9b237a153118d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -103,7 +103,7 @@
     <string name="list_download_progress_newer"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g></string>
     <string name="list_download_progress_eta_newer"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>)</string>
     <string name="list_verifying_update">Verifying update</string>
-    <string name="list_no_updates">No new updates found. To manually check for new updates, use the Refresh button.</string>
+    <string name="list_no_updates">You are running the latest /e/OS version. To manually check for updates, use the Refresh button.</string>
 
     <string name="action_download">Download</string>
     <string name="action_pause">Pause</string>
@@ -165,4 +165,7 @@
     <string name="info_dialog_title">Did you know?</string>
     <string name="info_dialog_message">/e/OS updates are full installation packages. That means you can always install only the latest update, even if you skipped some in between!</string>
     <string name="info_dialog_ok">Thanks for the info!</string>
+    
+    <string name="available_updates">Available updates:</string>
+    <string name="current_version">Current version:</string>
 </resources>
diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index cdd12d5278150e7e44fe2f55335222912000e7d9..7e36740e7e1cd2465148f448d0b2be6d25a29e6b 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -285,10 +285,10 @@ public class UpdatesActivity extends UpdatesListActivity {
         List<UpdateInfo> sortedUpdates = controller.getUpdates();
         if (sortedUpdates.isEmpty()) {
             findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE);
-            findViewById(R.id.recycler_view).setVisibility(View.GONE);
+            findViewById(R.id.content).setVisibility(View.GONE);
         } else {
             findViewById(R.id.no_new_updates_view).setVisibility(View.GONE);
-            findViewById(R.id.recycler_view).setVisibility(View.VISIBLE);
+            findViewById(R.id.content).setVisibility(View.VISIBLE);
             sortedUpdates.sort((u1, u2) -> Long.compare(u2.getTimestamp(), u1.getTimestamp()));
             for (UpdateInfo update : sortedUpdates) {
                 updateIds.add(update.getDownloadId());
@@ -428,7 +428,7 @@ public class UpdatesActivity extends UpdatesListActivity {
                 mRefreshIconView.setEnabled(false);
             }
         } else {
-            findViewById(R.id.recycler_view).setVisibility(View.GONE);
+            findViewById(R.id.content).setVisibility(View.GONE);
             findViewById(R.id.no_new_updates_view).setVisibility(View.GONE);
             findViewById(R.id.refresh_progress).setVisibility(View.VISIBLE);
         }
@@ -443,7 +443,7 @@ public class UpdatesActivity extends UpdatesListActivity {
         } else {
             findViewById(R.id.refresh_progress).setVisibility(View.GONE);
             if (mAdapter.getItemCount() > 0) {
-                findViewById(R.id.recycler_view).setVisibility(View.VISIBLE);
+                findViewById(R.id.content).setVisibility(View.VISIBLE);
             } else {
                 findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE);
             }