Added checkbox and radio with fixes