Cleanup button handling