Control widget. Minor fixes