Button overhaul