Added checkbox, removed button