Added some corrections of custom control
some corrections