Reworking buttons