diff --git a/src/components/status/status.js b/src/components/status/status.js
index 9f6be831c..ac58c3b8d 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -105,7 +105,6 @@ const Status = {
     isPreview: Boolean,
     noHeading: Boolean,
     inlineExpanded: Boolean,
-    showPinned: Boolean,
     inProfile: Boolean,
     inConversation: Boolean,
     inQuote: Boolean,
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 8cc8c95f0..0db67f24b 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -169,7 +169,7 @@
 
               <span class="heading-right">
                 <span
-                  v-if="showPinned"
+                  v-if="mainStatus.pinned"
                   class="pin"
                 >
                   <FAIcon
diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index 01913f709..b21d4eb04 100644
--- a/src/components/tab_switcher/tab_switcher.jsx
+++ b/src/components/tab_switcher/tab_switcher.jsx
@@ -101,6 +101,10 @@ export default {
         classesTab.push('active')
         classesWrapper.push('active')
       }
+      if (props.disabled) {
+        classesTab.push('disabled')
+        classesWrapper.push('disabled')
+      }
       if (props.image) {
         return (
           <div class={classesWrapper.join(' ')}>
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index f72c7f93c..ee18b0c4d 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -27,11 +27,10 @@ library.add(faCircleNotch, faCog, faMinus, faArrowUp, faCirclePlus, faCheck)
 const Timeline = {
   props: {
     timelineRef: Object,
-    count: Number,
     footerSlipgate: Object, // reference to an element where we should put our footer
     embedded: Boolean,
     inProfile: Boolean,
-    skipPinned: Boolean,
+    skipPinned: Boolean
   },
   data() {
     return {
@@ -59,6 +58,9 @@ const Timeline = {
         .map((id) => useStatusesStore().allStatuses.get(id))
         .filter(({ pinned }) => (this.skipPinned ? !pinned : true))
     },
+    count() {
+      return this.timeline.order.length
+    },
     newStatusCount() {
       return this.timeline.newStatusCount
     },
@@ -190,13 +192,12 @@ const Timeline = {
       if (!this.virtualScrollingEnabled) return
 
       const statuses = this.$refs.timeline.children
+      if (statuses.length === 0) return
       const cappedScrollIndex = Math.max(
         0,
         Math.min(this.virtualScrollIndex, statuses.length - 1),
       )
 
-      if (statuses.length === 0) return
-
       const height = Math.max(document.body.offsetHeight, window.pageYOffset)
 
       const centerOfScreen = window.pageYOffset + window.innerHeight * 0.5
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 745d8c399..faf184504 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -84,7 +84,7 @@
         />
       </div>
     </div>
-    <div :class="classes.footer">
+    <div v-if="!embedded || footerSlipgate" :class="classes.footer">
       <teleport
         :to="footerSlipgate"
         :disabled="!embedded || !footerSlipgate"
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 774ecd479..dd91b8cc9 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -100,7 +100,6 @@ const UserProfile = {
     },
     load(userNameOrId) {
       const loadById = (userId) => {
-        console.log('LOAD', userId)
         this.userId = userId
       }
 
@@ -139,7 +138,6 @@ const UserProfile = {
       }
     },
     switchUser(userNameOrId) {
-      console.log('USER SWITCH')
       this.load(userNameOrId)
     },
     onTabSwitch(tab) {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index fbad5c42d..f60521ffa 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -23,18 +23,14 @@
           key="statuses"
           class="statuses"
           :label="$t('user_card.statuses')"
-          :count="user.statuses_count"
           :title="$t('user_profile.timeline_title')"
         >
-          <!--
           <Timeline
             key="statuses"
             :timeline-ref="{ name: 'userPinned', argument: userId }"
             embedded
             in-profile
-            :footer-slipgate="footerRef"
           />
-          -->
           <Timeline
             :timeline-ref="{ name: 'user', argument: userId }"
             embedded
@@ -81,7 +77,6 @@
         <Timeline
           key="media"
           :label="$t('user_card.media')"
-          :disabled="media.visibleStatusIds.size === 0"
           :title="$t('user_card.media')"
           :timeline-ref="{ name: 'media', argument: userId }"
           embedded