changed some buttons
merge