More work on SetButton design