Updated checkboxes to lists, minor bugs