WIP: Fixed button mixin logic