SEP-04. added radio buttons instead of checkbox
fixed merge issues