clean
Add correct files back in
fix SearchView arrangement