Refactored widget actions