diff --git a/src/renderer/components/download-settings/download-settings.vue b/src/renderer/components/download-settings/download-settings.vue
index 4ca6c15605f85..ffdbb5319808b 100644
--- a/src/renderer/components/download-settings/download-settings.vue
+++ b/src/renderer/components/download-settings/download-settings.vue
@@ -11,35 +11,38 @@
         @change="updateDownloadBehavior"
       />
     </ft-flex-box>
-    <ft-flex-box
+    <template
       v-if="downloadBehavior === 'download'"
-      class="settingsFlexStart500px"
     >
-      <ft-toggle-switch
-        :label="$t('Settings.Download Settings.Ask Download Path')"
-        :default-value="askForDownloadPath"
-        @change="handleDownloadingSettingChange"
-      />
-    </ft-flex-box>
-    <ft-flex-box
-      v-if="!askForDownloadPath && downloadBehavior === 'download'"
-    >
-      <ft-input
-        class="folderDisplay"
-        :placeholder="downloadPath"
-        :show-action-button="false"
-        :show-label="false"
-        :disabled="true"
-      />
-    </ft-flex-box>
-    <ft-flex-box
-      v-if="!askForDownloadPath && downloadBehavior === 'download'"
-    >
-      <ft-button
-        :label="$t('Settings.Download Settings.Choose Path')"
-        @click="chooseDownloadingFolder"
-      />
-    </ft-flex-box>
+      <ft-flex-box
+        class="settingsFlexStart500px"
+      >
+        <ft-toggle-switch
+          :label="$t('Settings.Download Settings.Ask Download Path')"
+          :default-value="askForDownloadPath"
+          @change="handleDownloadingSettingChange"
+        />
+      </ft-flex-box>
+      <template
+        v-if="!askForDownloadPath"
+      >
+        <ft-flex-box>
+          <ft-input
+            class="folderDisplay"
+            :placeholder="downloadPath"
+            :show-action-button="false"
+            :show-label="false"
+            :disabled="true"
+          />
+        </ft-flex-box>
+        <ft-flex-box>
+          <ft-button
+            :label="$t('Settings.Download Settings.Choose Path')"
+            @click="chooseDownloadingFolder"
+          />
+        </ft-flex-box>
+      </template>
+    </template>
   </ft-settings-section>
 </template>
 
diff --git a/src/renderer/components/ft-profile-edit/ft-profile-edit.vue b/src/renderer/components/ft-profile-edit/ft-profile-edit.vue
index d0824574f4b6e..6d17bcd3cb0f7 100644
--- a/src/renderer/components/ft-profile-edit/ft-profile-edit.vue
+++ b/src/renderer/components/ft-profile-edit/ft-profile-edit.vue
@@ -70,23 +70,25 @@
           :label="$t('Profile.Create Profile')"
           @click="saveProfile"
         />
-        <ft-button
-          v-if="!isNew"
-          :label="$t('Profile.Update Profile')"
-          @click="saveProfile"
-        />
-        <ft-button
-          v-if="!isNew"
-          :label="$t('Profile.Make Default Profile')"
-          @click="setDefaultProfile"
-        />
-        <ft-button
-          v-if="!isMainProfile && !isNew"
-          :label="$t('Profile.Delete Profile')"
-          text-color="var(--text-with-main-color)"
-          background-color="var(--primary-color)"
-          @click="openDeletePrompt"
-        />
+        <template
+          v-else
+        >
+          <ft-button
+            :label="$t('Profile.Update Profile')"
+            @click="saveProfile"
+          />
+          <ft-button
+            :label="$t('Profile.Make Default Profile')"
+            @click="setDefaultProfile"
+          />
+          <ft-button
+            v-if="!isMainProfile"
+            :label="$t('Profile.Delete Profile')"
+            text-color="var(--text-with-main-color)"
+            background-color="var(--primary-color)"
+            @click="openDeletePrompt"
+          />
+        </template>
       </ft-flex-box>
     </ft-card>
     <ft-prompt
diff --git a/src/renderer/components/proxy-settings/proxy-settings.vue b/src/renderer/components/proxy-settings/proxy-settings.vue
index 4c1d4ca623ab3..7b9a1dbfd2dd5 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.vue
+++ b/src/renderer/components/proxy-settings/proxy-settings.vue
@@ -9,7 +9,7 @@
         @change="handleUpdateProxy"
       />
     </ft-flex-box>
-    <div
+    <template
       v-if="useProxy"
     >
       <ft-flex-box>
@@ -72,7 +72,7 @@
           {{ $t('Settings.Proxy Settings.City') }}: {{ proxyCity }}
         </p>
       </div>
-    </div>
+    </template>
   </ft-settings-section>
 </template>
 
diff --git a/src/renderer/components/sponsor-block-settings/sponsor-block-settings.vue b/src/renderer/components/sponsor-block-settings/sponsor-block-settings.vue
index 44de745c5baaf..e7fa17f2a8c6e 100644
--- a/src/renderer/components/sponsor-block-settings/sponsor-block-settings.vue
+++ b/src/renderer/components/sponsor-block-settings/sponsor-block-settings.vue
@@ -15,7 +15,7 @@
         @change="handleUpdateUseDeArrowTitles"
       />
     </ft-flex-box>
-    <div
+    <template
       v-if="useSponsorBlock || useDeArrowTitles"
     >
       <ft-flex-box
@@ -46,7 +46,7 @@
           :category-name="category"
         />
       </ft-flex-box>
-    </div>
+    </template>
   </ft-settings-section>
 </template>
 
diff --git a/src/renderer/views/Subscriptions/Subscriptions.vue b/src/renderer/views/Subscriptions/Subscriptions.vue
index ac258357cddf9..5a0d805468515 100644
--- a/src/renderer/views/Subscriptions/Subscriptions.vue
+++ b/src/renderer/views/Subscriptions/Subscriptions.vue
@@ -62,16 +62,16 @@
         role="tabpanel"
       />
       <subscriptions-shorts
-        v-if="currentTab === 'shorts'"
+        v-else-if="currentTab === 'shorts'"
         id="subscriptionsPanel"
         role="tabpanel"
       />
       <subscriptions-live
-        v-if="currentTab === 'live'"
+        v-else-if="currentTab === 'live'"
         id="subscriptionsPanel"
         role="tabpanel"
       />
-      <p v-if="currentTab === null">
+      <p v-else-if="currentTab === null">
         {{ $t("Subscriptions.All Subscription Tabs Hidden", {
           subsection: $t('Settings.Distraction Free Settings.Sections.Subscriptions Page'),
           settingsSection: $t('Settings.Distraction Free Settings.Distraction Free Settings')