new2
add buttons. fixed some bugs