Added additional checkboxes, next working on radio buttons