Improve widget