Refactored search panel