Andrew s/add clear button

-add clear button, fix bug