added some buttons and checkboxes, more changes going to be added