Added highlight and deletion functionality