Improve button mixins