Sample Widget refactored