Refactoring widgets
Merge pull request #412 from magefad/refactoring-widgets

Refactoring widgets