improved layout
fixed cancel button bug
updated all custom controls
fixed cv control bug