Buttons enhancements