Widget Preference Screen tweaks and some cleanup