fixing the buttons (bad merge)