Integrated search window

[jobytoss]

For future development, maybe you'll consider a design change: integrate the search window in the main one (like Cathy has).
Thanks!