fix buttons
merge conflicts