Move search back to the top

Let's not overcomplicate things by fragmenting the UI.