small refactoring
refactored widget window