Buttons to Display Logic reworked