Small Rework for Buttons