Improve the common widgets