* You can now use checkbox :)

* Small cleanup