Clean up button bars