Edited ControlTestForm
Edited Switch

Bug Fix
Added ButtonWithBorder