Improve SampleWidget