Improve some widgets