Fixed some problems with Widgets.