diff --git a/src/modules/[chain]/cosmwasm/index.vue b/src/modules/[chain]/cosmwasm/index.vue
index 16150b44..f27aec43 100644
--- a/src/modules/[chain]/cosmwasm/index.vue
+++ b/src/modules/[chain]/cosmwasm/index.vue
@@ -16,16 +16,16 @@ wasmStore.wasmClient.getWasmCodeList().then(x =>{
 <template>
     <div>
         <VCard>
-            <VCardTitle>Cosmos Wasm</VCardTitle>
+            <VCardTitle>Cosmos Wasm Smart Contracts</VCardTitle>
             <VTable>
                 <thead>
-                    <tr><th>Code Id</th><th>Creator</th><th>Code Hash</th><th>Permissions</th></tr>
+                    <tr><th>Code Id</th><th>Code Hash</th><th>Creator</th><th>Permissions</th></tr>
                 </thead>
                 <tbody>
                     <tr v-for="v in codes.code_infos">
                         <td>{{ v.code_id }}</td>
-                        <td>{{ v.creator }}</td>
                         <td><RouterLink :to="`/${props.chain}/cosmwasm/${v.code_id}/contracts`"><div class="text-truncate" style="max-width: 200px;">{{ v.data_hash }}</div></RouterLink></td>
+                        <td>{{ v.creator }}</td>
                         <td>
                             {{ v.instantiate_permission?.permission }}
                             <span>{{ v.instantiate_permission?.address }} {{ v.instantiate_permission.addresses.join(", ") }}</span>
diff --git a/src/modules/[chain]/gov/index.vue b/src/modules/[chain]/gov/index.vue
index 373c7445..d39d524b 100644
--- a/src/modules/[chain]/gov/index.vue
+++ b/src/modules/[chain]/gov/index.vue
@@ -6,7 +6,12 @@ const tab = ref('');
 const store = useGovStore();
 
 onMounted(() => {
-  store.fetchProposals('2');
+  store.fetchProposals('2').then(x => {
+    if(x.proposals.length ===0 ) {
+      tab.value = "3"
+      store.fetchProposals('3')
+    }
+  });
 });
 </script>
 <template>
diff --git a/src/modules/[chain]/uptime/index.vue b/src/modules/[chain]/uptime/index.vue
index bf12e191..ef52fe40 100644
--- a/src/modules/[chain]/uptime/index.vue
+++ b/src/modules/[chain]/uptime/index.vue
@@ -41,14 +41,12 @@ onMounted(() => {
       for (let i = height - 1; i > height - 50; i -= 1) {
         if (i > height - 48) {
           promise = promise.then(() => new Promise((resolve, reject) => {
-            baseStore.fetchBlock(i).then((x) => {
-              commits.value.unshift(x.block.last_commit)
-              if(live.value) {
-                resolve()
-              } else {
-                reject()
-              }
-            })
+            if(live.value) { // continue only if the page is living
+              baseStore.fetchBlock(i).then((x) => {
+                commits.value.unshift(x.block.last_commit)
+                  resolve()
+              })
+            }
           }))
         }
       }