Merge WidgetDesignerBase to WidgetControlBase
Minor bug fix and refactoring