Update some references to the layout of iwidgets