Added checkbox toggle and events