Added management for buttons