Fixing search view
Renamed a few links