new buttons and fix some bugs