Improve sample widget