Added buttons mixin changes