Add tracking of button and reformat list