Simplify button toggling