little change in SearchFragment
Resolved conflicts
SearchFragment changed to switch views