Added search button
Refactoring
Refactoring