Buttons enchancements