Removed some type code, improved checkbox and radio UI and options