Rework buttons for Results panel