wip widget list
WIP Widget List
Fixed merge
Merge branch 'feature/widgetlist'