Simplified button handling across all windows