updated new buttons
fix bug