diff --git a/ui/layouts/default.vue b/ui/layouts/default.vue
index 11bb176d..9319a463 100644
--- a/ui/layouts/default.vue
+++ b/ui/layouts/default.vue
@@ -87,7 +87,7 @@
           </div>
 
           <div class="navbar-item is-hidden-mobile">
-            <button class="button is-dark has-tooltip-bottom" v-tooltip.bottom="'WebUI Settings'"
+            <button class="button is-dark has-tooltip-bottom mr-4" v-tooltip.bottom="'WebUI Settings'"
               @click="show_settings = !show_settings">
               <span class="icon"><i class="fas fa-cog" /></span>
             </button>
diff --git a/ui/pages/changelog.vue b/ui/pages/changelog.vue
index 3b57e18b..f6204b33 100644
--- a/ui/pages/changelog.vue
+++ b/ui/pages/changelog.vue
@@ -1,59 +1,88 @@
 <template>
-  <div>
+  <main>
     <div class="mt-1 columns is-multiline">
       <div class="column is-12 is-clearfix is-unselectable">
         <span class="title is-4">
           <span class="icon"><i class="fas fa-cogs" /></span>
           CHANGELOG
         </span>
+
         <div class="is-hidden-mobile">
           <span class="subtitle">This page display the latest changes and updates from the project.</span>
         </div>
       </div>
     </div>
-    <div class="column is-12" v-for="(log, index) in logs" :key="log.tag">
-      <div class="content">
-        <h1 class="is-4">
-          <span class="icon-text">
-            <span class="icon"><i class="fas fa-code-branch"></i></span>
-            <span>
-              {{ log.tag }} <span class="tag has-text-success" v-if="isInstalled(log.tag)">Installed</span>
-            </span>
-          </span>
-        </h1>
-        <hr>
-        <ul>
-          <li v-for="commit in log.commits" :key="commit.sha">
-            <strong>{{ ucFirst(commit.message).replace(/\.$/, "") }}.</strong> -
-            <small>
-              <NuxtLink :to="`https://github.com/arabcoders/ytptube/commit/${commit.sha}`" target="_blank">
-                <span class="has-tooltip" v-tooltip="`SHA: ${commit.sha} - Date: ${commit.date}`">
-                  {{ moment(commit.date).fromNow() }}
-                </span>
-              </NuxtLink>
-            </small>
-          </li>
-        </ul>
-        <hr v-if="index < logs.length - 1">
+
+    <div class="columns is-multiline" v-if="isLoading">
+      <div class="column is-12">
+        <Message message_class="has-background-info-90 has-text-dark" title="Loading" icon="fas fa-spinner fa-spin"
+          message="Loading data. Please wait..." />
       </div>
     </div>
-  </div>
+
+    <template v-if="!isLoading">
+      <div class="logs-container">
+        <div class="columns is-multiline">
+          <div class="column is-12" v-for="(log, index) in logs" :key="log.tag">
+            <div class="content">
+              <h1 class="is-4">
+                <span class="icon"><i class="fas fa-code-branch" /></span>
+                {{ formatTag(log.tag) }} <span class="tag has-text-success" v-if="isInstalled(log.tag)">Installed</span>
+              </h1>
+              <hr>
+              <ul>
+                <li v-for="commit in log.commits" :key="commit.sha">
+                  <strong>{{ ucFirst(commit.message).replace(/\.$/, "") }}.</strong> -
+                  <small>
+                    <NuxtLink :to="`https://github.com/arabcoders/ytptube/commit/${commit.sha}`" target="_blank">
+                      <span class="has-tooltip" v-tooltip="`SHA: ${commit.sha} - Date: ${commit.date}`">
+                        {{ moment(commit.date).fromNow() }}
+                      </span>
+                    </NuxtLink>
+                  </small>
+                </li>
+              </ul>
+              <hr v-if="index < logs.length - 1">
+            </div>
+          </div>
+        </div>
+      </div>
+    </template>
+  </main>
 </template>
+
 <script setup>
 import moment from 'moment'
 
 useHead({ title: 'CHANGELOG' })
 
 const REPO_URL = "https://arabcoders.github.io/ytptube/CHANGELOG-{branch}.json?version={version}";
-const logs = ref([]);
+const toast = useNotification();
 const config = useConfigStore()
+
+const logs = ref([]);
 const api_version = ref('')
+const isLoading = ref(false);
 
 const branch = computed(() => {
   const branch = String(api_version.value).split('-')[0] ?? 'master';
   return ['master', 'dev'].includes(branch) ? branch : 'master';
 });
 
+
+const formatTag = tag => {
+  const parts = tag.split('-');
+  if (parts.length < 3) {
+    return tag;
+  }
+  const branch = parts[0];
+  const date = parts[1];
+  const shortSha = parts[2].substring(0, 7);
+  return `${ucFirst(branch)}: ${moment(date, 'YYYYMMDD').format('YYYY-MM-DD')} - ${shortSha}`;
+}
+
+
+
 watch(() => config.app.version, async value => {
   if (!value) {
     return
@@ -70,19 +99,37 @@ const loadContent = async () => {
     return
   }
 
+  isLoading.value = true;
   try {
     const changes = await fetch(r(REPO_URL, { branch: branch.value, version: api_version.value }));
     logs.value = await changes.json();
   } catch (e) {
     console.error(e);
-    notification('error', 'Error', `Failed to fetch changelog. ${e.message}`);
+    toast.error('error', 'Error', `Failed to fetch changelog. ${e.message}`);
+  } finally {
+    isLoading.value = false;
   }
 }
 
 const isInstalled = tag => {
   const installed = String(api_version.value).split('-').pop();
-  return tag.endsWith(installed);
+  const tagHash = tag.split('-').pop();
+  return tagHash.startsWith(installed);
 }
 
 onMounted(() => loadContent());
 </script>
+
+<style scoped>
+.logs-container {
+  padding: 1rem;
+  min-width: 100%;
+  max-height: 73vh;
+  overflow-y: auto;
+  overflow-x: auto;
+}
+
+hr {
+  border-bottom: 1px solid #b2d1ff;
+}
+</style>