diff --git a/Cargo.lock b/Cargo.lock
index dca0fb59..6ec25caf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1855,7 +1855,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-live"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1864,7 +1864,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1872,7 +1872,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1881,7 +1881,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "0.6.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "ab_glyph_rasterizer",
  "makepad-platform",
@@ -1894,22 +1894,22 @@ dependencies = [
 [[package]]
 name = "makepad-futures"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "0.7.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 
 [[package]]
 name = "makepad-http"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 
 [[package]]
 name = "makepad-live-compiler"
 version = "0.5.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-derive-live",
  "makepad-live-tokenizer",
@@ -1919,7 +1919,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-live-id-macros",
 ]
@@ -1927,7 +1927,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1935,7 +1935,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-tokenizer"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-live-id",
  "makepad-math",
@@ -1945,17 +1945,17 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-micro-serde-derive",
 ]
@@ -1963,7 +1963,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1971,12 +1971,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 
 [[package]]
 name = "makepad-platform"
 version = "0.6.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-futures",
  "makepad-futures-legacy",
@@ -1991,7 +1991,7 @@ dependencies = [
 [[package]]
 name = "makepad-shader-compiler"
 version = "0.5.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-live-compiler",
 ]
@@ -1999,7 +1999,7 @@ dependencies = [
 [[package]]
 name = "makepad-vector"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "ttf-parser",
 ]
@@ -2007,7 +2007,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "0.4.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -2016,7 +2016,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "0.6.0"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -2027,7 +2027,7 @@ dependencies = [
 [[package]]
 name = "makepad-windows"
 version = "0.51.1"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "windows-core 0.51.1 (git+https://github.com/makepad/makepad?branch=rik)",
  "windows-targets",
@@ -2036,7 +2036,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.2.14"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "bitflags 2.4.1",
 ]
@@ -2044,7 +2044,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "simd-adler32",
 ]
@@ -2052,7 +2052,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.3.17"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -2060,7 +2060,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.2.1"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -4809,7 +4809,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.51.1"
-source = "git+https://github.com/makepad/makepad?branch=rik#ad3357224d2eb4f638367fe177fe1f13e395bfab"
+source = "git+https://github.com/makepad/makepad?branch=rik#6f42e6c5123a7dda011c34d1d3e6b2685f21c46a"
 dependencies = [
  "windows-targets",
 ]
diff --git a/src/contacts/contacts_list.rs b/src/contacts/contacts_list.rs
index 60010578..bb4db35b 100644
--- a/src/contacts/contacts_list.rs
+++ b/src/contacts/contacts_list.rs
@@ -174,7 +174,7 @@ impl Widget for ContactsList {
 
     fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
         let grouped_data = self.group_by_first_letter();
-        let groups_count: u64 = grouped_data.len() as u64;
+        let groups_count = grouped_data.len();
 
         while let Some(list_item) = self.view.draw_walk(cx, scope, walk).step(){
             if let Some(mut list) = list_item.as_portal_list().borrow_mut() {
diff --git a/src/discover/moment_list.rs b/src/discover/moment_list.rs
index 019605d7..73777e15 100644
--- a/src/discover/moment_list.rs
+++ b/src/discover/moment_list.rs
@@ -180,7 +180,7 @@ impl Widget for MomentList {
     }
 
     fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
-        let moment_entries_count = self.moment_entries.len() as u64;
+        let moment_entries_count = self.moment_entries.len();
 
         while let Some(item) = self.view.draw_walk(cx, scope, walk).step(){
             if let Some(mut list) = item.as_portal_list().borrow_mut() {
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index 225a7aac..c12e7066 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -721,7 +721,7 @@ struct SavedState {
     /// The ID of the first item in the timeline's PortalList that is currently visible.
     ///
     /// TODO: expose scroll position from PortalList and use that instead, which is more accurate.
-    first_id: u64,
+    first_id: usize,
 }
 
 impl Timeline {
@@ -838,18 +838,17 @@ impl Widget for Timeline {
             for action in actions {
                 let stack_view_subwidget_action = action.as_widget_action().cast();
                 match stack_view_subwidget_action {
-                    // TODO: this should be `HideEnd`, but we don't currently receive any `HideEnd` events
-                    //       at all due to a presumed bug with the Stack Navigation widget.
-                    StackNavigationTransitionAction::HideBegin => {
+                    StackNavigationTransitionAction::HideEnd => {
                         self.save_state();
                         continue;
                     }
-                    StackNavigationTransitionAction::Show => {
+                    StackNavigationTransitionAction::ShowBegin => {
                         self.restore_state();
                         self.redraw(cx);
                         continue;
                     }
-                    StackNavigationTransitionAction::HideEnd
+                    StackNavigationTransitionAction::HideBegin
+                    | StackNavigationTransitionAction::ShowDone
                     | StackNavigationTransitionAction::None => { }
                 }
 
@@ -874,7 +873,7 @@ impl Widget for Timeline {
         let tl_items = &tl_state.items;
 
         // Determine length of the portal list based on the number of timeline items.
-        let last_item_id = tl_items.len() as u64;
+        let last_item_id = tl_items.len();
         let last_item_id = last_item_id + 1; // Add 1 for the TopSpace.
 
         // Start the actual drawing procedure.
@@ -975,7 +974,7 @@ impl Widget for Timeline {
 fn populate_message_view(
     cx: &mut Cx,
     list: &mut PortalList,
-    item_id: u64,
+    item_id: usize,
     event_tl_item: &EventTimelineItem,
     message: &timeline::Message,
     media_cache: &mut MediaCache,
@@ -1082,7 +1081,7 @@ fn populate_message_view(
 fn populate_redacted_message_view(
     cx: &mut Cx,
     list: &mut PortalList,
-    item_id: u64,
+    item_id: usize,
     event_tl_item: &EventTimelineItem,
     _room_id: &OwnedRoomId
 ) -> WidgetRef {
@@ -1139,7 +1138,7 @@ fn populate_redacted_message_view(
 fn populate_membership_change_view(
     cx: &mut Cx,
     list: &mut PortalList,
-    item_id: u64,
+    item_id: usize,
     event_tl_item: &EventTimelineItem,
     change: &RoomMembershipChange,
 ) -> WidgetRef {
@@ -1207,7 +1206,7 @@ fn populate_membership_change_view(
 fn populate_profile_change_view(
     cx: &mut Cx,
     list: &mut PortalList,
-    item_id: u64,
+    item_id: usize,
     event_tl_item: &EventTimelineItem,
     change: &MemberProfileChange,
 ) -> WidgetRef {
@@ -1254,7 +1253,7 @@ fn populate_profile_change_view(
 fn populate_other_state_view(
     cx: &mut Cx,
     list: &mut PortalList,
-    item_id: u64,
+    item_id: usize,
     event_tl_item: &EventTimelineItem,
     other_state: &timeline::OtherState,
 ) -> WidgetRef {
diff --git a/src/home/rooms_list.rs b/src/home/rooms_list.rs
index 4ef2b421..61962076 100644
--- a/src/home/rooms_list.rs
+++ b/src/home/rooms_list.rs
@@ -287,7 +287,7 @@ impl Widget for RoomsList {
 
         // TODO: sort list of `all_rooms` by alphabetic, most recent message, grouped by spaces, etc
 
-        let count = self.all_rooms.len() as u64;
+        let count = self.all_rooms.len();
         let last_item_id = count + 1; // Add 1 for the search bar up top.
 
         // Start the actual drawing procedure.
@@ -315,7 +315,7 @@ impl Widget for RoomsList {
                         });
                     } else {
                         item.as_view().apply_over(cx, live!{
-                            height: Fit,
+                            // height: Fit,
                             label = { text: (&self.status) }
                         });
                     }