Improve checkbox events