Better handling of the WidgetSettingsActivity