Some fixes in control widget