Fixed Buttons Bug