finally fixed the buttons