Added checkbox and radiobox widgets