Move search to separate layout