Moved widgets to separate files
Start working on embed mode
Merge remote-tracking branch 'origin/development' into development