Add search view and few little things