Fixing bug #2
Implementing checkbox wrapper