Merge refactor on master
Update
Update
Update
Widgets part I
Remove sensitive data
Remove sensitive data