Improved widget