finally fixed all buttons