Some fixes, Some updates - Still with some bugs Search View