Tidy up the widget wizard a bit