Almost have popups working - search is also working