diff --git a/gfx/container.lua b/gfx/container.lua
index 1bbd44e..b30925e 100644
--- a/gfx/container.lua
+++ b/gfx/container.lua
@@ -38,17 +38,4 @@ function Container:setStrict(strict)
   end
 end
 
-function Container:_reload()
-  Element._reload(self)
-
-  -- Reload child windows
-  local win = self:_getWindow()
-  for _,child in self:_iterateChildren() do
-    if child:_getWindow() ~= win then
-      child:setParent(win)
-      child:_reload()
-    end
-  end
-end
-
 return Container
\ No newline at end of file
diff --git a/gfx/element.lua b/gfx/element.lua
index 9c92d58..c1b569d 100644
--- a/gfx/element.lua
+++ b/gfx/element.lua
@@ -121,10 +121,13 @@ function Element:_getWindow()
 end
 
 function Element:_setWindow(window)
+  self:setDirty()
   self.window = window
 end
 
 function Element:setVisible(visible)
+  self:setDirty()
+  self.visible = visible
   self:_getWindow().setVisible(visible)
 end
 
@@ -189,10 +192,6 @@ function Element:getId()
   return self.id
 end
 
-function Element:redraw()
-  self:_getWindow().redraw()
-end
-
 function Element:handleEvent(evt)
   if Event.isClickEvent(evt) and Event.containsClick(self, evt) and self.onClick ~= nil then
     local x, y, source = Event.getClickParams(evt)
@@ -210,6 +209,7 @@ function Element:_reload()
     local win = window.create(self.parent, self:getX(), self:getY(), self:getWidth(), self:getHeight(), self:isVisible())
     win.setBackgroundColor(self:getBgColor())
     win.setTextColor(self:getFgColor())
+    win.setVisible(self.visible)
     self:_setWindow(win)
   end
 end
diff --git a/gfx/list.lua b/gfx/list.lua
index c98f248..d10cc9f 100644
--- a/gfx/list.lua
+++ b/gfx/list.lua
@@ -57,16 +57,6 @@ function List:getWidth()
 end
 
 function List:_reload()
-  Element._reload(self)
-
-  -- Reload child windows
-  local win = self:_getWindow()
-  for _,child in self:_iterateChildren() do
-    if child:_getWindow() ~= win then
-      child:setParent(win)
-    end
-  end
-
   self:adjustPositions()
 end
 
diff --git a/gfx/prop/children.lua b/gfx/prop/children.lua
index c8a6877..e837a61 100644
--- a/gfx/prop/children.lua
+++ b/gfx/prop/children.lua
@@ -5,6 +5,7 @@ local Children = Prop:new{ defaultState = {}, uid = "CHILDREN" }
 
 function Children:with(elementType)
   local propSelf = self
+  local defaultReload = elementType._reload
   function elementType:_iterateChildren()
     return ipairs(self:_children())
   end
@@ -147,6 +148,22 @@ function Children:with(elementType)
     return Element.handleEvent(self, evt)
   end
 
+  function elementType:_reload()
+    Element._reload(self)
+  
+    -- Reload child windows
+    local win = self:_getWindow()
+    for _,child in self:_iterateChildren() do
+      if child:_getWindow() ~= win then
+        child:setParent(win)
+      end
+    end
+
+    if defaultReload ~= nil and defaultReload ~= Element._reload then
+      defaultReload(self)
+    end
+  end
+
   return elementType
 end