widgetAdd now does the box / grid decision, and some oter things moved into it.