clean
small refactoring
refactored widget window
Merge branch 'develop'