Improved radio buttons and checkboxes