fixing buttons
fix merge conflicts