diff -r 376ef91111f6 -r b174e721663e ui/gtk/container.c
--- a/ui/gtk/container.c	Wed Dec 17 22:36:41 2025 +0100
+++ b/ui/gtk/container.c	Sat Dec 27 22:47:56 2025 +0100
@@ -170,8 +170,6 @@
 #else
     gtk_box_pack_start(GTK_BOX(ct->widget), widget, expand, fill, 0);
 #endif
-    
-    ct->current = widget;
 }
 
 UiContainerX* ui_grid_container(
@@ -226,8 +224,6 @@
     
     gtk_grid_attach(GTK_GRID(ct->widget), widget, grid->x, grid->y, colspan, rowspan);
     grid->x += colspan;
-    
-    grid->container.current = widget;
 }
 #endif
 #ifdef UI_GTK2
@@ -288,7 +284,6 @@
 void ui_frame_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout) {
     widget = ui_gtk_set_margin(widget, layout->margin, layout->margin_left, layout->margin_right, layout->margin_top, layout->margin_bottom);
     FRAME_SET_CHILD(ct->widget, widget);
-    ct->current = widget;
 }
 
 UiContainerX* ui_expander_container(UiObject *obj, GtkWidget *expander) {
@@ -304,14 +299,12 @@
 void ui_expander_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout) {
     widget = ui_gtk_set_margin(widget, layout->margin, layout->margin_left, layout->margin_right, layout->margin_top, layout->margin_bottom);
     EXPANDER_SET_CHILD(ct->widget, widget);
-    ct->current = widget;
 }
 
 void ui_scrolledwindow_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout) {
     widget = ui_gtk_set_margin(widget, layout->margin, layout->margin_left, layout->margin_right, layout->margin_top, layout->margin_bottom);
     // TODO: check if the widget implements GtkScrollable
     SCROLLEDWINDOW_SET_CHILD(ct->widget, widget);
-    ct->current = widget;
 }
 
 UiContainerX* ui_scrolledwindow_container(UiObject *obj, GtkWidget *scrolledwindow) {
@@ -342,8 +335,6 @@
     }
     widget = ui_gtk_set_margin(widget, layout->margin, layout->margin_left, layout->margin_right, layout->margin_top, layout->margin_bottom);
     data->add_tab(ct->widget, -1, layout->label, widget);
-    
-    ct->current = widget;
 }
 
 #ifdef UI_GTK2
@@ -1162,7 +1153,7 @@
     ct->orientation = orientation;
     ct->max = max;
     ct->initial_position = init;
-    ct->children = cxArrayListCreateSimple(CX_STORE_POINTERS, 4);
+    ct->children = cxArrayListCreate(NULL, CX_STORE_POINTERS, 4);
     return ct;
 }
 
@@ -1246,7 +1237,7 @@
 static void update_itemlist(UiList *list, int c) {
     UiGtkItemListContainer *ct = list->obj;
     
-    CxMap *new_items = cxHashMapCreateSimple(CX_STORE_POINTERS);
+    CxMap *new_items = cxHashMapCreate(NULL, CX_STORE_POINTERS, 32);
     new_items->collection.advanced_destructor = remove_item;
     new_items->collection.destructor_data = ct;
     
@@ -1331,7 +1322,7 @@
     container->create_ui = args->create_ui;
     container->userdata = args->userdata;
     container->subcontainer = args->subcontainer;
-    container->current_items = cxHashMapCreateSimple(CX_STORE_POINTERS);
+    container->current_items = cxHashMapCreate(NULL, CX_STORE_POINTERS, 32);
     container->current_items->collection.advanced_destructor = remove_item;
     container->current_items->collection.destructor_data = container;
     container->margin = args->sub_margin;