Simplify by removing maybeSetButton