Cooler buttons plus more cleanup