Fixed search panels. Some refactoring still necessary to make the screen better