Review the logic for buttons (bis)