Working on widget
Some cleaning