Updated the way the size of the control is handled