Minor bug fixes
Added CheckBox Control