fixed all buttons
fixed all buttons