added demo mode and text widget
fixed merge conflict