Updated view logic for showing buttons and checkboxes