fix bug, add buttons