Changed 'done' button, fixed a bug, remove the red elipse