Fix onClick callback when clicked on close
Fix overlay remove