add buttons(should not to be in this branch)