Refactoring
GUI - added search