Widgets Fixes