Embrace the flexible box model in the widgets

I would add 1 argument, which is the version above which it will be removed. 
Otherwise its languishes, and we never cleanup things.