diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
index 0c894754f..1e438f8af 100644
--- a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
+++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
@@ -107,7 +107,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
         
         guard var room = self.state.rooms.first(where: { $0.id == roomSummary.id }) else {
             return HomeScreenRoom(id: roomSummary.id,
-                                  displayName: roomSummary.displayName ?? roomSummary.name,
+                                  displayName: roomSummary.displayName,
                                   topic: roomSummary.topic,
                                   lastMessage: lastMessage,
                                   avatar: roomSummary.avatar,
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
index 2f5527e81..b738e4953 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
@@ -84,7 +84,7 @@ struct HomeScreen: View {
                             EmptyView()
                         }
                     }
-                    .animation(.easeInOut, value: context.viewState.userAvatar)
+                    .animation(.default, value: context.viewState.userAvatar)
                     .transition(.opacity)
                     
                     ZStack {
@@ -96,7 +96,7 @@ struct HomeScreen: View {
                             EmptyView()
                         }
                     }
-                    .animation(.easeInOut, value: context.viewState.userDisplayName)
+                    .animation(.default, value: context.viewState.userDisplayName)
                     .transition(.opacity)
                 }
             }
@@ -150,7 +150,7 @@ struct RoomCell: View {
                     }
                 }
             }
-            .animation(.easeInOut, value: room)
+            .animation(.default, value: room)
             .frame(minHeight: 60.0)
             .task {
                 context.send(viewAction: .loadRoomData(roomIdentifier: room.id))
diff --git a/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift b/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift
index f7c027fbd..e761918f8 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift
@@ -50,6 +50,7 @@ struct MessageComposerTextField: View {
             .background(placeholderView, alignment: .topLeading)
             .clipShape(rect)
             .overlay(rect.stroke(borderColor, lineWidth: borderWidth))
+            .animation(.default, value: isEditing)
     }
     
     @ViewBuilder
diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
index a210711d5..1f9b6a016 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
@@ -23,13 +23,13 @@ struct RoomScreen: View {
     var body: some View {
         VStack(spacing: 0.0) {
             TimelineView(context: context)
-                .navigationTitle(context.viewState.roomTitle)
-                .navigationBarTitleDisplayMode(.inline)
             MessageComposer(text: $context.composerText, disabled: context.viewState.sendButtonDisabled) {
                 sendMessage()
             }
             .padding()
         }
+        .navigationTitle(context.viewState.roomTitle)
+        .navigationBarTitleDisplayMode(.inline)
     }
     
     private func sendMessage() {
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift
index 5d31f7ddb..f95a3d933 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift
@@ -38,7 +38,7 @@ struct EventBasedTimelineView: View {
         }
         .clipShape(Circle())
         .frame(width: 24.0, height: 24.0)
-        .animation(.easeInOut, value: timelineItem.senderAvatar)
+        .animation(.default, value: timelineItem.senderAvatar)
     }
     
     private var firstLetter: String {
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
index b098edbc3..990dddaa0 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
@@ -35,7 +35,7 @@ struct ImageRoomTimelineView: View {
                         .aspectRatio(timelineItem.aspectRatio, contentMode: .fit)
                 }
             }
-            .animation(.easeInOut, value: timelineItem.image)
+            .animation(.default, value: timelineItem.image)
             .frame(maxHeight: 1000.0)
         } else {
             VStack(alignment: .leading) {