more updates to button mixin