diff --git a/frontend/src/components/sidebar/Sidebar.vue b/frontend/src/components/sidebar/Sidebar.vue
index afdd53a5..ecc535c9 100644
--- a/frontend/src/components/sidebar/Sidebar.vue
+++ b/frontend/src/components/sidebar/Sidebar.vue
@@ -321,10 +321,7 @@ const sidebarOpen = useStorage('sidebarOpen', true)
               <SidebarHeader>
                 <SidebarMenu>
                   <SidebarMenuItem>
-                    <SidebarMenuButton
-                      :isActive="isActiveParent('/reports/overview')"
-                      asChild
-                    >
+                    <SidebarMenuButton :isActive="isActiveParent('/reports/overview')" asChild>
                       <div>
                         <span class="font-semibold text-2xl">Reports</span>
                       </div>
@@ -424,10 +421,7 @@ const sidebarOpen = useStorage('sidebarOpen', true)
               <SidebarHeader>
                 <SidebarMenu>
                   <SidebarMenuItem>
-                    <SidebarMenuButton
-                      :isActive="isActiveParent('/account/profile')"
-                      asChild
-                    >
+                    <SidebarMenuButton :isActive="isActiveParent('/account/profile')" asChild>
                       <div>
                         <span class="font-semibold text-2xl">Account</span>
                       </div>
@@ -558,7 +552,7 @@ const sidebarOpen = useStorage('sidebarOpen', true)
                             <SidebarMenuSubItem>
                               <SidebarMenuButton
                                 size="sm"
-                                :isActive="isActiveParent(`/inboxes/teams/${team.id}`)"
+                                :is-active="route.params.teamID == team.id"
                                 asChild
                               >
                                 <router-link
@@ -604,13 +598,13 @@ const sidebarOpen = useStorage('sidebarOpen', true)
                             <SidebarMenuSubItem>
                               <SidebarMenuButton
                                 size="sm"
-                                :isActive="isActiveParent(`/inboxes/views/${view.id}`)"
+                                :isActive="route.params.viewID == view.id"
                                 asChild
                               >
                                 <router-link
                                   :to="{ name: 'view-inbox', params: { viewID: view.id } }"
                                 >
-                                <span class="break-all w-24">{{ view.name }}</span>
+                                  <span class="break-all w-24">{{ view.name }}</span>
                                 </router-link>
                               </SidebarMenuButton>
 
diff --git a/frontend/src/features/conversation/list/ConversationListItem.vue b/frontend/src/features/conversation/list/ConversationListItem.vue
index fb4b42be..95f151ce 100644
--- a/frontend/src/features/conversation/list/ConversationListItem.vue
+++ b/frontend/src/features/conversation/list/ConversationListItem.vue
@@ -10,9 +10,9 @@
       <!-- Avatar -->
       <Avatar class="w-12 h-12 rounded-full shadow">
         <AvatarImage
-          :src="conversation.avatar_url"
+          :src="conversation.contact.avatar_url"
           class="object-cover"
-          v-if="conversation.avatar_url"
+          v-if="conversation.contact.avatar_url"
         />
         <AvatarFallback>
           {{ conversation.contact.first_name.substring(0, 2).toUpperCase() }}
diff --git a/frontend/src/features/conversation/message/ContactMessageBubble.vue b/frontend/src/features/conversation/message/ContactMessageBubble.vue
index 2250549d..1c356b40 100644
--- a/frontend/src/features/conversation/message/ContactMessageBubble.vue
+++ b/frontend/src/features/conversation/message/ContactMessageBubble.vue
@@ -21,7 +21,6 @@
       <div
         class="flex flex-col justify-end message-bubble bg-white border border-border rounded-lg p-3 max-w-[80%]"
         :class="{
-          '!rounded-tl-none': true,
           'show-quoted-text': showQuotedText,
           'hide-quoted-text': !showQuotedText
         }"