Fix default widget
Compiled Version
Merge master into compiled