Improve buttons mixin