Add search support, change delete icon