Fix Search and Done button