Added checkbox and radio button