remove some unused buttons and add two new