Popup and search panel changes (Issue #4)