Improved the widget and the localization support