Revamp buttons