Added in a new button "Done" but some errors