Added UI Changes and partial search function