diff --git a/advotracker/examples/advowidgets.rs b/advotracker/examples/advowidgets.rs
index 2609a1a..4bcbe17 100644
--- a/advotracker/examples/advowidgets.rs
+++ b/advotracker/examples/advowidgets.rs
@@ -41,12 +41,14 @@ impl State for MainViewState {
                         main_view(ctx.widget())
                             .list_mut()
                             .push(format!("Item {}", len + 1));
-                            ctx.child("items").set::<usize>("blub", len + 1);
+                        ctx.child("items").clone_or_default::<usize>("Item");
                         items_widget(ctx.child("items")).set_count(len + 1);
                         button(ctx.child("remove-item-button")).set_enabled(true);
+                        button(ctx.child("remove-item-button")).set_visibility(Visibility::Visible);
 
                         if len == 4 {
                             button(ctx.child("add-item-button")).set_enabled(false);
+                            button(ctx.child("add-item-button")).set_visibility(Visibility::Collapsed);
                         }
                     }
                 }
@@ -56,10 +58,11 @@ impl State for MainViewState {
                         main_view(ctx.widget()).list_mut().remove(len - 1);
                         items_widget(ctx.child("items")).set_count(len - 1);
                         button(ctx.child("add-item-button")).set_enabled(true);
+                        button(ctx.child("add-item-button")).set_visibility(Visibility::Visible);
 
                         if len == 1 {
                             button(ctx.child("remove-item-button")).set_enabled(false);
-                        }
+                            button(ctx.child("remove-item-button")).set_visibility(Visibility::Collapsed);                        }
                     }
                 }
                 Action::IncrementCounter => {