diff --git a/build/check-versions.mjs b/build/check-versions.mjs
index c22004b00..8c5968a30 100644
--- a/build/check-versions.mjs
+++ b/build/check-versions.mjs
@@ -36,6 +36,7 @@ export default function () {
       const warning = warnings[i]
       console.warn('  ' + warning)
     }
+    console.warn()
     process.exit(1)
   }
 }
diff --git a/src/App.vue b/src/App.vue
index c1a7199d7..f432d8bc4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -28,10 +28,10 @@
       >
         <user-panel />
         <template v-if="layoutType !== 'mobile'">
-          <NavPanel />
-          <InstanceSpecificPanel v-if="showInstanceSpecificPanel" />
-          <FeaturesPanel v-if="!currentUser && showFeaturesPanel" />
-          <WhoToFollowPanel v-if="currentUser && suggestionsEnabled" />
+          <nav-panel />
+          <instance-specific-panel v-if="showInstanceSpecificPanel" />
+          <features-panel v-if="!currentUser && showFeaturesPanel" />
+          <who-to-follow-panel v-if="currentUser && suggestionsEnabled" />
           <div id="notifs-sidebar" />
         </template>
       </div>
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index a3d8701e5..e18cfa788 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -152,10 +152,8 @@ const getStaticConfig = async () => {
       throw res
     }
   } catch (error) {
-    console.warn(
-      'Failed to load static/config.json, continuing without it.',
-      error,
-    )
+    console.warn('Failed to load static/config.json, continuing without it.')
+    console.warn(error)
     return {}
   }
 }
@@ -444,7 +442,8 @@ const getNodeInfo = async ({ store }) => {
       throw res
     }
   } catch (e) {
-    console.warn('Could not load nodeinfo', e)
+    console.warn('Could not load nodeinfo')
+    console.warn(e)
   }
 }
 
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 6c4568d14..0146a3de8 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -333,6 +333,7 @@ const EmojiInput = {
       if (!this.pickerShown) {
         this.scrollIntoView()
         this.$refs.picker.showPicker()
+        this.$refs.picker.startEmojiLoad()
       } else {
         this.$refs.picker.hidePicker()
       }
diff --git a/src/components/instance_specific_panel/instance_specific_panel.vue b/src/components/instance_specific_panel/instance_specific_panel.vue
index 597155e27..c8ed0a2de 100644
--- a/src/components/instance_specific_panel/instance_specific_panel.vue
+++ b/src/components/instance_specific_panel/instance_specific_panel.vue
@@ -11,9 +11,3 @@
 </template>
 
 <script src="./instance_specific_panel.js"></script>
-
-<style lang="scss">
-  .instance-specific-panel .panel-body {
-    border-radius: var(--roundness);
-  }
-</style>
diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue
index 98fba754d..1e2efe402 100644
--- a/src/components/interactions/interactions.vue
+++ b/src/components/interactions/interactions.vue
@@ -42,6 +42,7 @@
     </tab-switcher>
     <Notifications
       ref="notifications"
+      :no-heading="true"
       :no-extra="true"
       :minimal-mode="true"
       :filter-mode="filterMode"
diff --git a/src/components/link-preview/link-preview.vue b/src/components/link-preview/link-preview.vue
index 7ff8433f4..18fc77df4 100644
--- a/src/components/link-preview/link-preview.vue
+++ b/src/components/link-preview/link-preview.vue
@@ -48,7 +48,6 @@
     img {
       width: 100%;
       height: 100%;
-      max-height: 10em;
       object-fit: cover;
       border-radius: var(--roundness);
     }
diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index ea45fd17f..e5ca9cefe 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -17,6 +17,7 @@
           type="text"
           :placeholder="$t('polls.option')"
           :maxlength="maxLength"
+          @change="updatePollToParent"
           @keydown.enter.stop.prevent="nextOption(index)"
         >
       </div>
@@ -49,6 +50,7 @@
           v-model="pollType"
           class="poll-type-select"
           unstyled="true"
+          @change="updatePollToParent"
         >
           <option value="single">
             {{ $t('polls.single_choice') }}
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 313ed71b0..1e93f9271 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -133,7 +133,6 @@
     &.suboptions {
       margin-left: 2em;
       border-top: 1px dotted var(--border);
-      border-bottom: 1px dotted var(--border);
     }
 
 
diff --git a/src/components/settings_modal/tabs/clutter_tab.vue b/src/components/settings_modal/tabs/clutter_tab.vue
index c0e6008f8..533cd85c6 100644
--- a/src/components/settings_modal/tabs/clutter_tab.vue
+++ b/src/components/settings_modal/tabs/clutter_tab.vue
@@ -50,16 +50,6 @@
             </li>
           </ul>
         </li>
-        <li>
-          <BooleanSetting path="userCardHidePersonalMarks">
-            {{ $t('settings.user_card_hide_personal_marks') }}
-          </BooleanSetting>
-        </li>
-        <li v-if="shoutAvailable">
-          <BooleanSetting path="hideShoutbox">
-            {{ $t('settings.hide_shoutbox') }}
-          </BooleanSetting>
-        </li>
       </ul>
       <h3>{{ $t('settings.attachments') }}</h3>
       <ul class="setting-list">
@@ -87,6 +77,16 @@
             {{ $t('settings.hide_attachments_in_convo') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting path="userCardHidePersonalMarks">
+            {{ $t('settings.user_card_hide_personal_marks') }}
+          </BooleanSetting>
+        </li>
+        <li v-if="shoutAvailable">
+          <BooleanSetting path="hideShoutbox">
+            {{ $t('settings.hide_shoutbox') }}
+          </BooleanSetting>
+        </li>
       </ul>
     </div>
   </div>
diff --git a/src/components/settings_modal/tabs/layout_tab.vue b/src/components/settings_modal/tabs/layout_tab.vue
index 0035f3a11..ca514e0cb 100644
--- a/src/components/settings_modal/tabs/layout_tab.vue
+++ b/src/components/settings_modal/tabs/layout_tab.vue
@@ -117,6 +117,7 @@
               :key="column"
               :local="true"
               :path="column + 'ColumnWidth'"
+              :units="horizontalUnits"
               expert="1"
             >
               {{ $t('settings.column_sizes_' + column) }}
diff --git a/src/components/settings_modal/tabs/posts_tab.js b/src/components/settings_modal/tabs/posts_tab.js
index dbf284d93..ab00e52e7 100644
--- a/src/components/settings_modal/tabs/posts_tab.js
+++ b/src/components/settings_modal/tabs/posts_tab.js
@@ -3,7 +3,6 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
-import UnitSetting from '../helpers/unit_setting.vue'
 
 import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
@@ -63,7 +62,6 @@ const PostsTab = {
     ChoiceSetting,
     IntegerSetting,
     FontControl,
-    UnitSetting,
   },
   computed: {
     ...SharedComputedObject(),
diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js
index 4d3ed1695..6c2366999 100644
--- a/src/components/settings_modal/tabs/style_tab/style_tab.js
+++ b/src/components/settings_modal/tabs/style_tab/style_tab.js
@@ -492,7 +492,7 @@ export default {
           try {
             return deserializeShadow(shadow)
           } catch (e) {
-            console.warn('Failed to deserialize shadow', e)
+            console.warn(e)
             return shadow
           }
         }
@@ -652,7 +652,7 @@ export default {
           return rgb2hex(computedColor)
         }
       } catch (e) {
-        console.warn('failed to get computed color', e)
+        console.warn(e)
       }
       return null
     }
diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js
index 52ca888fe..066fe9d71 100644
--- a/src/components/shadow_control/shadow_control.js
+++ b/src/components/shadow_control/shadow_control.js
@@ -125,7 +125,7 @@ export default {
           if (computedColor) return rgb2hex(computedColor)
           return null
         } catch (e) {
-          console.warn('Failed to get fallback color', e)
+          console.warn(e)
           return null
         }
       } else {
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 0fc494434..38d2bc3de 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -4,7 +4,6 @@ import StatusBookmarkFolderMenu from 'src/components/status_bookmark_folder_menu
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -97,9 +96,6 @@ export default {
       return !useInstanceCapabilitiesStore()
         .pleromaCustomEmojiReactionsAvailable
     },
-    hidePostStats() {
-      return useMergedConfigStore().mergedConfig.hidePostStats
-    },
     buttonInnerClass() {
       return [
         this.button.name + '-button',
diff --git a/src/components/status_action_buttons/action_button.vue b/src/components/status_action_buttons/action_button.vue
index 82b481127..502ee5b2e 100644
--- a/src/components/status_action_buttons/action_button.vue
+++ b/src/components/status_action_buttons/action_button.vue
@@ -59,7 +59,7 @@
       />
     </component>
     <span
-      v-if="!hidePostStats && button.counter?.(funcArg) > 0"
+      v-if="button.counter?.(funcArg) > 0"
       class="action-counter"
     >
       {{ button.counter?.(funcArg) }}
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 2d6bfb722..7f3865374 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -403,12 +403,6 @@ export default {
     allowNonSquareEmoji() {
       return this.mergedConfig.nonSquareEmoji
     },
-    hideUserStats() {
-      return this.mergedConfig.hideUserStats
-    },
-    hideRemarks() {
-      return this.mergedConfig.userCardHidePersonalMarks
-    },
     ...mapState(useMergedConfigStore, ['mergedConfig']),
   },
   methods: {
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 49675779e..875028937 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -304,7 +304,7 @@
       </div>
     </div>
     <div
-      v-if="!editable && loggedIn && isOtherUser && (hasNote || !hideBio) && !hideRemarks"
+      v-if="!editable && loggedIn && isOtherUser && (hasNote || !hideBio) && !userCardHidePersonalMarks"
       class="personal-marks"
     >
       <UserNote
diff --git a/src/components/user_timed_filter_modal/user_timed_filter_modal.scss b/src/components/user_timed_filter_modal/user_timed_filter_modal.scss
index 961656442..24388868f 100644
--- a/src/components/user_timed_filter_modal/user_timed_filter_modal.scss
+++ b/src/components/user_timed_filter_modal/user_timed_filter_modal.scss
@@ -10,15 +10,4 @@
   .footer-left-checkbox {
     width: max-content;
   }
-
-  .expirationTime {
-    display: inline-flex;
-    white-space: nowrap;
-    padding: 0.5em;
-  }
-
-  .dialog-modal-content .checkbox {
-    vertical-align: middle;
-    padding: 0.5em;
-  }
 }
diff --git a/src/components/user_timed_filter_modal/user_timed_filter_modal.vue b/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
index 0ccf2812c..91c05ad77 100644
--- a/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
+++ b/src/components/user_timed_filter_modal/user_timed_filter_modal.vue
@@ -11,50 +11,48 @@
     <p>
       {{ $t(isMute ? 'user_card.expire_mute_message' : 'user_card.expire_block_message', [user.screen_name]) }}
     </p>
-    <div>
+    <p>
       {{ $t('user_card.expire_in') }}
-      <span class="expirationTime">
-        <input
-          id="userFilterExpires"
-          v-model="expiration"
-          class="input input-expire-in"
-          :class="{ disabled: forever }"
-          :disabled="forever"
-          min="1"
-          type="number"
+      <input
+        id="userFilterExpires"
+        v-model="expiration"
+        class="input input-expire-in"
+        :class="{ disabled: forever }"
+        :disabled="forever"
+        min="1"
+        type="number"
+      >
+      <Select
+        id="userFilterExpiresUnit"
+        v-model="expirationUnit"
+        class="input unit-input unstyled"
+        :disabled="forever"
+      >
+        <option
+          key="s"
+          value="s"
         >
-        <Select
-          id="userFilterExpiresUnit"
-          v-model="expirationUnit"
-          class="input unit-input unstyled"
-          :disabled="forever"
+          {{ $t('time.unit.seconds_suffix') }}
+        </option>
+        <option
+          key="m"
+          value="m"
         >
-          <option
-            key="s"
-            value="s"
-          >
-            {{ $t('time.unit.seconds_suffix') }}
-          </option>
-          <option
-            key="m"
-            value="m"
-          >
-            {{ $t('time.unit.minutes_suffix') }}
-          </option>
-          <option
-            key="h"
-            value="h"
-          >
-            {{ $t('time.unit.hours_suffix') }}
-          </option>
-          <option
-            key="d"
-            value="d"
-          >
-            {{ $t('time.unit.days_suffix') }}
-          </option>
-        </Select>
-      </span>
+          {{ $t('time.unit.minutes_suffix') }}
+        </option>
+        <option
+          key="h"
+          value="h"
+        >
+          {{ $t('time.unit.hours_suffix') }}
+        </option>
+        <option
+          key="d"
+          value="d"
+        >
+          {{ $t('time.unit.days_suffix') }}
+        </option>
+      </Select>
 
       {{ $t('user_card.mute_or') }}
 
@@ -66,7 +64,7 @@
       >
         {{ $t('user_card.mute_block_never') }}
       </Checkbox>
-    </div>
+    </p>
 
     <template #footerLeft>
       <div class="footer-left-checkbox">
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 99652a104..339b6193a 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -348,7 +348,8 @@ const addNewStatuses = (
       // NOOP, it is known status but we don't do anything about it for now
     },
     default: (unknown) => {
-      console.warn('unknown status type', unknown)
+      console.warn('unknown status type')
+      console.warn(unknown)
     },
   }
 
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index 0c5c82991..62666d5f8 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -99,16 +99,12 @@ export const findColor = (color, { dynamicVars, staticVars }) => {
         const staticVar = staticVars[variableSlot]
         const dynamicVar = dynamicVars[variableSlot]
         if (!staticVar && !dynamicVar) {
-          console.warn(
-            `Couldn't find variable "${variableSlot}", falling back to magenta. Variables are:
+          console.warn(dynamicVars, variableSlot, dynamicVars[variableSlot])
+          console.warn(`Couldn't find variable "${variableSlot}", falling back to magenta. Variables are:
 Static:
 ${JSON.stringify(staticVars, null, 2)}
 Dynamic:
-${JSON.stringify(dynamicVars, null, 2)}`,
-            dynamicVars,
-            variableSlot,
-            dynamicVars[variableSlot],
-          )
+${JSON.stringify(dynamicVars, null, 2)}`)
         }
         targetColor = convert(staticVar ?? dynamicVar ?? '#FF00FF').rgb
       }
diff --git a/test/unit/specs/components/gallery.spec.js b/test/unit/specs/components/gallery.spec.js
index c80d902f0..d4c466586 100644
--- a/test/unit/specs/components/gallery.spec.js
+++ b/test/unit/specs/components/gallery.spec.js
@@ -146,7 +146,11 @@ describe('Gallery', () => {
       { items: [{ type: 'image' }] },
       { audio: true, items: [{ type: 'audio' }] },
       {
-        items: [{ type: 'image' }, { type: 'image' }, { type: 'image' }],
+        items: [
+          { type: 'image' },
+          { type: 'image' },
+          { type: 'image' },
+        ],
       },
     ])
   })
@@ -247,19 +251,31 @@ describe('Gallery', () => {
 
     expect(Gallery.computed.rows.call(local)).to.eql([
       {
-        items: [{ type: 'image' }, { type: 'image' }],
+        items: [
+          { type: 'image' },
+          { type: 'image' },
+        ],
       },
       {
-        items: [{ type: 'image' }, { type: 'image' }],
+        items: [
+          { type: 'image' },
+          { type: 'image' },
+        ],
       },
       { audio: true, items: [{ type: 'audio' }] },
       { items: [{ type: 'image' }] },
       { audio: true, items: [{ type: 'audio' }] },
       {
-        items: [{ type: 'image' }, { type: 'image' }],
+        items: [
+          { type: 'image' },
+          { type: 'image' },
+        ],
       },
       {
-        items: [{ type: 'image' }, { type: 'image' }],
+        items: [
+          { type: 'image' },
+          { type: 'image' },
+        ],
       },
     ])
   })