cleanup + 2 buttons