corrections in buttons
merge