More widget selector and widget visibility fixes